diff --git a/test-cases/aum-api.yaml b/test-cases/aum-api.yaml
index 6531d2e965bb6fb70f2e974e0de732bd7969cc05..dfcaef47eba48a9e8e6f0f0a4fca76a6d60389fa 100644
--- a/test-cases/aum-api.yaml
+++ b/test-cases/aum-api.yaml
@@ -2,7 +2,8 @@ metadata:
   name: aum-api
   format: "Apertis Test Definition 1.0"
   image-types:
-    minimal: [ armhf ]
+    minimal: [ armhf-internal, armhf, arm64, amd64 ]
+    target:  [ armhf-internal, armhf, arm64, amd64 ]
   image-deployment:
     - OSTree
   type: functional
diff --git a/test-cases/aum-offline-upgrade-collection_id.yaml b/test-cases/aum-offline-upgrade-collection_id.yaml
index 2b23a0436ae2d3878dbddc503fb96d1bf944e78e..4933611f6209f8f74dec4354854c4afc6e52cd7c 100644
--- a/test-cases/aum-offline-upgrade-collection_id.yaml
+++ b/test-cases/aum-offline-upgrade-collection_id.yaml
@@ -2,8 +2,8 @@ metadata:
   name: aum-offline-upgrade-collection_id
   format: "Apertis Test Definition 1.0"
   image-types:
-    minimal: [ armhf, arm64, amd64 ]
-    target:  [ armhf, amd64 ]
+    minimal: [ armhf-internal, armhf, arm64, amd64 ]
+    target:  [ armhf-internal, armhf, arm64, amd64 ]
   image-deployment:
     - OSTree
   type: functional
diff --git a/test-cases/aum-offline-upgrade-signed.yaml b/test-cases/aum-offline-upgrade-signed.yaml
index 0be8d2887998fee8aab70f4d512b783f9d60c7a3..51780590bf0af4ddc086ed2861bdbb52a5fa4462 100644
--- a/test-cases/aum-offline-upgrade-signed.yaml
+++ b/test-cases/aum-offline-upgrade-signed.yaml
@@ -2,7 +2,8 @@ metadata:
   name: aum-offline-upgrade-signed
   format: "Apertis Test Definition 1.0"
   image-types:
-    minimal: [ armhf ]
+    minimal: [ armhf-internal, armhf, arm64, amd64 ]
+    target:  [ armhf-internal, armhf, arm64, amd64 ]
   image-deployment:
     - OSTree
   type: functional
diff --git a/test-cases/aum-offline-upgrade.yaml b/test-cases/aum-offline-upgrade.yaml
index d3c2eb71b9a5db23a7676ebc6e79c3ec31e36a4b..7596466eb07b7d39869a3e5e95e16456b47c8ecc 100644
--- a/test-cases/aum-offline-upgrade.yaml
+++ b/test-cases/aum-offline-upgrade.yaml
@@ -2,7 +2,8 @@ metadata:
   name: aum-offline-upgrade
   format: "Apertis Test Definition 1.0"
   image-types:
-    minimal: [ armhf ]
+    minimal: [ armhf-internal, armhf, arm64, amd64 ]
+    target:  [ armhf-internal, armhf, arm64, amd64 ]
   image-deployment:
     - OSTree
   type: functional
diff --git a/test-cases/aum-out-of-space.yaml b/test-cases/aum-out-of-space.yaml
index def71bc6d920753f46b7f306e8b379be09a84c1e..4e77fd28a49eb314cd7fff75bee529185d921c52 100644
--- a/test-cases/aum-out-of-space.yaml
+++ b/test-cases/aum-out-of-space.yaml
@@ -2,7 +2,8 @@ metadata:
   name: aum-out-of-space
   format: "Apertis Test Definition 1.0"
   image-types:
-    minimal: [ armhf ]
+    minimal: [ armhf-internal, armhf, arm64, amd64 ]
+    target:  [ armhf-internal, armhf, arm64, amd64 ]
   image-deployment:
     - OSTree
   type: functional
diff --git a/test-cases/aum-power-cut.yaml b/test-cases/aum-power-cut.yaml
index 5719256bf762dd8aa84c94c2c32e23a059844ee0..3947acdcafa7cc12e18437f0e327e6540f183551 100644
--- a/test-cases/aum-power-cut.yaml
+++ b/test-cases/aum-power-cut.yaml
@@ -2,7 +2,8 @@ metadata:
   name: aum-power-cut
   format: "Apertis Test Definition 1.0"
   image-types:
-    minimal: [ armhf ]
+    minimal: [ armhf-internal, armhf, arm64, amd64 ]
+    target:  [ armhf-internal, armhf, arm64, amd64 ]
   image-deployment:
     - OSTree
   type: functional
diff --git a/test-cases/aum-rollback-blacklist.yaml b/test-cases/aum-rollback-blacklist.yaml
index 03140332d361ddcf5f31fc7c198142e083449f02..0dcfcd5b5e4271ebf7706f7c4b443a663c2e15a7 100644
--- a/test-cases/aum-rollback-blacklist.yaml
+++ b/test-cases/aum-rollback-blacklist.yaml
@@ -2,7 +2,8 @@ metadata:
   name: aum-rollback-blacklist
   format: "Apertis Test Definition 1.0"
   image-types:
-    minimal: [ armhf ]
+    minimal: [ armhf-internal, armhf ]
+    target:  [ armhf-internal, armhf ]
   image-deployment:
     - OSTree
   type: functional