diff --git a/files/hotfix/autocloud/__init__.py b/files/hotfix/autocloud/__init__.py
index 84d100516f..77cb9147aa 100644
--- a/files/hotfix/autocloud/__init__.py
+++ b/files/hotfix/autocloud/__init__.py
@@ -27,7 +27,7 @@ def produce_jobs(infox):
     session = init_model()
     timestamp = datetime.datetime.now()
     for info in infox:
-        image_name = info['path'].split('.x86_64')[0].split('/')[-1]
+        image_name = info['path'].split('/')[-1].split(info['arch'])[0]
         jd = ComposeJobDetails(
             arch=info['arch'],
             compose_id=info['compose']['id'],
diff --git a/files/hotfix/autocloud/consumer.py b/files/hotfix/autocloud/consumer.py
index 1147b769c4..99b8b65805 100644
--- a/files/hotfix/autocloud/consumer.py
+++ b/files/hotfix/autocloud/consumer.py
@@ -78,6 +78,12 @@ class AutoCloudConsumer(fedmsg.consumers.FedmsgConsumer):
             for variant in compose_images_variants:
                 compose_image = compose_images[variant]
                 for arch, payload in compose_image.iteritems():
+
+                    # aarch64 is not supported so filter if the arch is
+                    # 'aarch64'
+                    if arch == 'aarch64':
+                        continue
+
                     for item in payload:
                         relative_path = item['path']
                         if not is_valid_image(relative_path):
diff --git a/files/hotfix/autocloud/models.py b/files/hotfix/autocloud/models.py
index 4a6f35f5a5..43f75f6f83 100644
--- a/files/hotfix/autocloud/models.py
+++ b/files/hotfix/autocloud/models.py
@@ -86,7 +86,8 @@ class ComposeJobDetails(Base):
 
     ARCH_TYPES = (
         ('i386', 'i386'),
-        ('x86_64', 'x86_64')
+        ('x86_64', 'x86_64'),
+        ('aarch64', 'aarch64')
     )
 
     id = Column(Integer, primary_key=True)