diff --git a/ci/c9s.yml b/ci/c9s.yml
index cc4fdb1774210e21edf27a6d61f1acc33349e544..d759e9d3199e2d7f96613690e0b5e3fc5cce99f4 100644
--- a/ci/c9s.yml
+++ b/ci/c9s.yml
@@ -2,7 +2,8 @@ cs9_unman_physical:
   extends: .test_unmanaged_physical
   variables:
     OS: 9s
-    ARCH: x96_64
+    ARCH: x86_64
+    EDITION: Test
   only:
     variables:
       - $TEST_OS9 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_UNMANAGED == 'True'
@@ -12,8 +13,9 @@ cs9_unman_virtual:
   extends: .test_unmanaged_virtual
   variables:
     OS: 9s
-    ARCH: x96_64
+    ARCH: x86_64
     DELETE_FAILURES: "False"
+    EDITION: Test
   only:
     variables:
       - $TEST_OS9 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_UNMANAGED == 'True'
@@ -23,7 +25,8 @@ cs9_puppet_physical:
   extends: .test_puppet_physical
   variables:
     OS: 9s
-    ARCH: x96_64
+    ARCH: x86_64
+    EDITION: Test
   only:
     variables:
       - $TEST_OS9 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_PUPPET == 'True'
@@ -33,7 +36,8 @@ cs9_puppet_virtual:
   extends: .test_puppet_virtual
   variables:
     OS: 9s
-    ARCH: x96_64
+    ARCH: x86_64
+    EDITION: Test
   only:
     variables:
       - $TEST_OS9 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True'
diff --git a/ci/common.yml b/ci/common.yml
index 9a1f5437e779fb997f304fc5db3263e3714db8a6..d3792ef11769dfc147dd61d5a9733511914c01af 100644
--- a/ci/common.yml
+++ b/ci/common.yml
@@ -36,10 +36,11 @@
           fi
         fi
       fi
-      IMAGE=$(openstack image list --property os_distro="${OS_DISTRO}" --property os_distro_major="${OS_MAJOR}" --property architecture="${ARCH}" --property os_edition="Base" $OS_VISIBILITY --sort created_at -c ID -f value | tail -n1)
+      OS_EDITION="${EDITION:-Base}"
+      IMAGE=$(openstack image list --property os_distro="${OS_DISTRO}" --property os_distro_major="${OS_MAJOR}" --property architecture="${ARCH}" --property os_edition="${OS_EDITION}" $OS_VISIBILITY --sort created_at -c ID -f value | tail -n1)
       if [[ -z "${IMAGE}" ]]; then
         echo "No image found matching:"
-        echo openstack image list --property os_distro="${OS_DISTRO}" --property os_distro_major="${OS_MAJOR}" --property architecture="${ARCH}" --property os_edition="Base" $OS_VISIBILITY --sort created_at
+        echo openstack image list --property os_distro="${OS_DISTRO}" --property os_distro_major="${OS_MAJOR}" --property architecture="${ARCH}" --property os_edition="${OS_EDITION}" $OS_VISIBILITY --sort created_at
         exit 1
       fi
     else