diff --git a/src/pylorax/api/compose.py b/src/pylorax/api/compose.py
index 95e0907f..5a2cc6e4 100644
--- a/src/pylorax/api/compose.py
+++ b/src/pylorax/api/compose.py
@@ -877,7 +877,7 @@ def compose_types(share_dir):
     disable_map = {
         "arm": ["alibaba", "ami", "google", "hyper-v", "vhd", "vmdk"],
         "armhfp": ["alibaba", "ami", "google", "hyper-v", "vhd", "vmdk"],
-        "aarch64": ["alibaba", "ami", "google", "hyper-v", "vhd", "vmdk"],
+        "aarch64": ["alibaba", "google", "hyper-v", "vhd", "vmdk"],
         "ppc": ["alibaba", "ami", "google", "hyper-v", "vhd", "vmdk"],
         "ppc64": ["alibaba", "ami", "google", "hyper-v", "vhd", "vmdk"],
         "ppc64le": ["alibaba", "ami", "google", "hyper-v", "vhd", "vmdk"],
diff --git a/tests/cli/test_compose_sanity.sh b/tests/cli/test_compose_sanity.sh
index 86acd99c..91138566 100755
--- a/tests/cli/test_compose_sanity.sh
+++ b/tests/cli/test_compose_sanity.sh
@@ -14,6 +14,10 @@ rlJournalStart
         if [ "$(uname -m)" = "x86_64" ]; then
             rlAssertEquals "lists all supported types" \
                     "`$CLI compose types | xargs`" "alibaba ami ext4-filesystem google live-iso openstack partitioned-disk qcow2 tar vhd vmdk"
+        elif [ "$(uname -m)" == "aarch64" ]; then
+            # ami is supported on aarch64
+            rlAssertEquals "lists all supported types" \
+                    "`$CLI compose types | xargs`" "ami ext4-filesystem live-iso liveimg-tar openstack partitioned-disk qcow2 tar"
         else
             # non-x86 architectures disable alibaba
             rlAssertEquals "lists all supported types" \