diff --git a/test-cases/apparmor-basic-profiles.yaml b/test-cases/apparmor-basic-profiles.yaml
index ce12c131e4b28cc980956ed7507f24f0907f54bf..567dad02202799225178a153e1bf67b29727583b 100644
--- a/test-cases/apparmor-basic-profiles.yaml
+++ b/test-cases/apparmor-basic-profiles.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/apparmor-bluez-avrcp-volume.yaml b/test-cases/apparmor-bluez-avrcp-volume.yaml
index ac7a517df74b649af502c3ec4967ec613f0a7c51..118f375a8ef5454dffe1b76ff923a8ff933028ea 100644
--- a/test-cases/apparmor-bluez-avrcp-volume.yaml
+++ b/test-cases/apparmor-bluez-avrcp-volume.yaml
@@ -2,7 +2,7 @@ metadata:
   name: apparmor-bluez-avrcp-volume
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
   image-deployment:
     - APT
   type: functional
diff --git a/test-cases/apparmor-bluez-setup.yaml b/test-cases/apparmor-bluez-setup.yaml
index e049c2c3afe3329b4f1f444b57b10b9c1cb5cdca..a1226cb0c3eb79399332afdfea5ba65f83526b24 100644
--- a/test-cases/apparmor-bluez-setup.yaml
+++ b/test-cases/apparmor-bluez-setup.yaml
@@ -2,7 +2,7 @@ metadata:
   name: apparmor-bluez-setup
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
   image-deployment:
     - APT
     - OSTree
diff --git a/test-cases/apparmor-bluez.yaml b/test-cases/apparmor-bluez.yaml
index 7a70a8eb637147b16c784c16e466263b260772f1..94bfc63a483ea10c2c5225fbae082302f801a33c 100644
--- a/test-cases/apparmor-bluez.yaml
+++ b/test-cases/apparmor-bluez.yaml
@@ -2,7 +2,7 @@ metadata:
   name: apparmor-bluez
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
   image-deployment:
     - APT
     - OSTree
diff --git a/test-cases/apparmor-chaiwala-system.yaml b/test-cases/apparmor-chaiwala-system.yaml
index 5cebf67f8c07d9da798a81e870dadc244d90b95a..26ebc3213f99c85b049c2c6f539c7ad0647c2e39 100644
--- a/test-cases/apparmor-chaiwala-system.yaml
+++ b/test-cases/apparmor-chaiwala-system.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/apparmor-dbus.yaml b/test-cases/apparmor-dbus.yaml
index 29cc7e12689e4b7ff1fe25591bbf7287c2b7d071..0e425c80afc5bb121681af4e54c6381cb6e03e62 100644
--- a/test-cases/apparmor-dbus.yaml
+++ b/test-cases/apparmor-dbus.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/apparmor-functional-demo.yaml b/test-cases/apparmor-functional-demo.yaml
index 41766521ddea5e82563b4f6a9e71a2ee5dbd0952..374292219ccce7014aae0416d531477fab24a159 100644
--- a/test-cases/apparmor-functional-demo.yaml
+++ b/test-cases/apparmor-functional-demo.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/apparmor-geoclue.yaml b/test-cases/apparmor-geoclue.yaml
index 2754d8a18aa8d1075aeb8b0ff758f2a23d8d06f1..636312bd4941a5400766f4eddc43bb7ad7ea1087 100644
--- a/test-cases/apparmor-geoclue.yaml
+++ b/test-cases/apparmor-geoclue.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/apparmor-gstreamer1-0.yaml b/test-cases/apparmor-gstreamer1-0.yaml
index 7839adda6c28edfe8baa27bccfbd2c8a3a717ed9..681a723df8cf76dc82b899b0100b8e3ae5cac2a6 100644
--- a/test-cases/apparmor-gstreamer1-0.yaml
+++ b/test-cases/apparmor-gstreamer1-0.yaml
@@ -2,7 +2,7 @@ metadata:
   name: apparmor-gstreamer1-0
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/apparmor-ofono.yaml b/test-cases/apparmor-ofono.yaml
index 7cb2475de04eeabe061e31f8940f7e76d62bb258..c38666a61a9b04fbe70ad2a6c109a4f815c7b4a2 100644
--- a/test-cases/apparmor-ofono.yaml
+++ b/test-cases/apparmor-ofono.yaml
@@ -2,7 +2,7 @@ metadata:
   name: apparmor-ofono
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
   image-deployment:
     - APT
   type: functional
diff --git a/test-cases/apparmor-pulseaudio.yaml b/test-cases/apparmor-pulseaudio.yaml
index 7bb037d485d4e8429cdaef12b3d6746227fa1762..911481ba651acdf0c48b74aee5a5eb38bd955ff2 100644
--- a/test-cases/apparmor-pulseaudio.yaml
+++ b/test-cases/apparmor-pulseaudio.yaml
@@ -2,7 +2,7 @@ metadata:
   name: apparmor-pulseaudio
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/apparmor-session-lockdown-no-deny.yaml b/test-cases/apparmor-session-lockdown-no-deny.yaml
index a7aeac1a30ebe0db0ea4cf47fdd150f0cfd2d192..428b99f8f298234e083970ece92870c35a1b927b 100644
--- a/test-cases/apparmor-session-lockdown-no-deny.yaml
+++ b/test-cases/apparmor-session-lockdown-no-deny.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/apparmor-tracker.yaml b/test-cases/apparmor-tracker.yaml
index ff7e1eb9474859325cdeaaace5028975bf4e57eb..7826bf79efe7b55f0d5225ba2e82be65f84efe6c 100644
--- a/test-cases/apparmor-tracker.yaml
+++ b/test-cases/apparmor-tracker.yaml
@@ -2,7 +2,7 @@ metadata:
   name: apparmor-tracker
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-tumbler.yaml b/test-cases/apparmor-tumbler.yaml
index fc3165f6a3d581ff0e510b3fa4dde6519bbaefa8..b9594120f1634ec20c25fd5075d704b241177112 100644
--- a/test-cases/apparmor-tumbler.yaml
+++ b/test-cases/apparmor-tumbler.yaml
@@ -2,7 +2,7 @@ metadata:
   name: apparmor-tumbler
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/apparmor-utils.yaml b/test-cases/apparmor-utils.yaml
index 5f0490dfddc1f3cdda1b2a10f11b0ff327bb6ef7..49c2597d1f1e60b88f22178a65bb8bf72ee42b9f 100644
--- a/test-cases/apparmor-utils.yaml
+++ b/test-cases/apparmor-utils.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/apparmor.yaml b/test-cases/apparmor.yaml
index e39d89a885d12547a92dc2329b73de01657e67a2..81ab2dbd77381332a1ea03100a5a3bbdafaa12ab 100644
--- a/test-cases/apparmor.yaml
+++ b/test-cases/apparmor.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/bluez-avrcp-volume.yaml b/test-cases/bluez-avrcp-volume.yaml
index b3203496eb569545e4eafdf46c05c894578ddf6f..ef68a20d8abb372baf73845d46edc31375a5ff90 100644
--- a/test-cases/bluez-avrcp-volume.yaml
+++ b/test-cases/bluez-avrcp-volume.yaml
@@ -2,7 +2,7 @@ metadata:
   name: bluez-avrcp-volume
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/bluez-hfp.yaml b/test-cases/bluez-hfp.yaml
index 143dd97bcb36d5eeb77de58310e1082bbeeecdd8..cd390ddfb3d2585dfd4410d7ef6c2231efbabd64 100644
--- a/test-cases/bluez-hfp.yaml
+++ b/test-cases/bluez-hfp.yaml
@@ -2,7 +2,7 @@ metadata:
   name: bluez-hfp
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/bluez-phone.yaml b/test-cases/bluez-phone.yaml
index 1c6f36d738e519c777f81f7c820f574f31f5b7b6..e23aa659f5e2b4706223a12fbceee85fd063bf4c 100644
--- a/test-cases/bluez-phone.yaml
+++ b/test-cases/bluez-phone.yaml
@@ -2,7 +2,7 @@ metadata:
   name: bluez-phone
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/bluez-setup.yaml b/test-cases/bluez-setup.yaml
index 1723129bb76b87448f45fdad50a3dc29e87c2db8..64404b315ea24174b70a946e243243b04d64b2ac 100644
--- a/test-cases/bluez-setup.yaml
+++ b/test-cases/bluez-setup.yaml
@@ -2,7 +2,7 @@ metadata:
   name: bluez-setup
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/boot-no-crashes.yaml b/test-cases/boot-no-crashes.yaml
index 1e04afc065725d46ae9760ba6b60f7dd69d68481..80c49f4ef16c5ac48387f7e3167d5f3ee759d9fe 100644
--- a/test-cases/boot-no-crashes.yaml
+++ b/test-cases/boot-no-crashes.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/boot-performance.yaml b/test-cases/boot-performance.yaml
index 74788d15df5b836154bc53c6a00913b87cf0dee9..3e5c96712193c3684c8ae8e509884670be4e86ff 100644
--- a/test-cases/boot-performance.yaml
+++ b/test-cases/boot-performance.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/canterbury.yaml b/test-cases/canterbury.yaml
index eff297cc31005bba73c892ff8109460a7fb524df..5cec6b6da3284237305e7d3b66ca688239043900 100644
--- a/test-cases/canterbury.yaml
+++ b/test-cases/canterbury.yaml
@@ -2,7 +2,7 @@ metadata:
   name: canterbury
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
     - APT
diff --git a/test-cases/cgroups-resource-control.yaml b/test-cases/cgroups-resource-control.yaml
index 78e3600aa5888d13c4debcd4b4f23c934f05b9a0..d4e1b625ec2d73e749c83f689d8367e877ad8108 100644
--- a/test-cases/cgroups-resource-control.yaml
+++ b/test-cases/cgroups-resource-control.yaml
@@ -2,7 +2,7 @@ metadata:
   name: cgroups-resource-control
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/connman-new-supplicant.yaml b/test-cases/connman-new-supplicant.yaml
index 9fc825d51146703f94a908af2ace4f167c7d94b2..c442f63686c4f3b2978e5cb329a43cf05c4c7691 100644
--- a/test-cases/connman-new-supplicant.yaml
+++ b/test-cases/connman-new-supplicant.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/connman-pan-network-access.yaml b/test-cases/connman-pan-network-access.yaml
index 10289d76ed515cbb6a2061a5bf5c533480dffdce..9853433d02455566562ae193b3c37e7b06dd33c4 100644
--- a/test-cases/connman-pan-network-access.yaml
+++ b/test-cases/connman-pan-network-access.yaml
@@ -2,7 +2,7 @@ metadata:
   name: connman-pan-network-access
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/connman-pan-tethering.yaml b/test-cases/connman-pan-tethering.yaml
index de068c8b44dc7ab6869a20377085f1480fad8e3f..a74b979d2516a36f3d1e2a73682e14e16337646c 100644
--- a/test-cases/connman-pan-tethering.yaml
+++ b/test-cases/connman-pan-tethering.yaml
@@ -2,7 +2,7 @@ metadata:
   name: connman-pan-tethering
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/connman-services.yaml b/test-cases/connman-services.yaml
index 17d804a98453ff66f69ae5b2ef49f5f13b3cee86..0a9c6638bd10137cf3d222cdaec016681ae2ab59 100644
--- a/test-cases/connman-services.yaml
+++ b/test-cases/connman-services.yaml
@@ -2,7 +2,7 @@ metadata:
   name: connman-services
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/connman-usb-tethering.yaml b/test-cases/connman-usb-tethering.yaml
index a0ec1e2cce76494b3a3b0b501ae47a29b0b5cf70..3421cd7953bf86ef87713f8c42684a0ad5c2b459 100644
--- a/test-cases/connman-usb-tethering.yaml
+++ b/test-cases/connman-usb-tethering.yaml
@@ -2,7 +2,7 @@ metadata:
   name: connman-usb-tethering
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/connman.yaml b/test-cases/connman.yaml
index e86678c0a24e25dfb6446a53e7dda4dd12d64323..a0e47f235f5b9320b04c930c2b2fbab7fd122708 100644
--- a/test-cases/connman.yaml
+++ b/test-cases/connman.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/dbus-dos-reply-time.yaml b/test-cases/dbus-dos-reply-time.yaml
index 7732bd9c7f48901da1994dc3dfaf9c9c5af2df6c..c45abc4477fe64abdd8d8046d3ddd720f9952e9c 100644
--- a/test-cases/dbus-dos-reply-time.yaml
+++ b/test-cases/dbus-dos-reply-time.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/dbus-installed-tests.yaml b/test-cases/dbus-installed-tests.yaml
index 9a5a47c11e4bcbe582d45ba792de3e0b901ff45d..397becfaf72ae9780fa33b8ee2b6e9a8d3bb3b7b 100644
--- a/test-cases/dbus-installed-tests.yaml
+++ b/test-cases/dbus-installed-tests.yaml
@@ -2,7 +2,7 @@ metadata:
   name: dbus-installed-tests
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/didcot.yaml b/test-cases/didcot.yaml
index 77f42510bf8d11720f65ccdde6281f16e7fed9c0..bdca2b935d227fb1e300968c74a6d86445023319 100644
--- a/test-cases/didcot.yaml
+++ b/test-cases/didcot.yaml
@@ -2,7 +2,7 @@ metadata:
   name: didcot
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
     - APT
diff --git a/test-cases/disk-rootfs-fsck.yaml b/test-cases/disk-rootfs-fsck.yaml
index 68075cd041ff2451c3e1853602d7a6bc555d4a4c..438a7d36671dadf35ca3926799fa28cd3cd8c862 100644
--- a/test-cases/disk-rootfs-fsck.yaml
+++ b/test-cases/disk-rootfs-fsck.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/evolution-sync-bluetooth.yaml b/test-cases/evolution-sync-bluetooth.yaml
index cea0cc6eb54eba169fc30c87b8963bf0bbf1b917..3ac926e3a74389c2594d4f0eb383813df6c9335d 100644
--- a/test-cases/evolution-sync-bluetooth.yaml
+++ b/test-cases/evolution-sync-bluetooth.yaml
@@ -2,7 +2,7 @@ metadata:
   name: evolution-sync-bluetooth
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
     - APT
diff --git a/test-cases/folks-ofono-backend.yaml b/test-cases/folks-ofono-backend.yaml
index dd2e2796bebcdc1eec96a81a92f976d0df1da1ea..14e004ae320b607cbffa496e2bb977a3f6f3df84 100644
--- a/test-cases/folks-ofono-backend.yaml
+++ b/test-cases/folks-ofono-backend.yaml
@@ -2,7 +2,7 @@ metadata:
   name: folks-ofono-backend
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
     - APT
diff --git a/test-cases/frome.yaml b/test-cases/frome.yaml
index 350bc80145320b4ff55927c551d17faf0cbe876d..2445a0d712c26d300994b0f3bf23bdc56ef3b98e 100644
--- a/test-cases/frome.yaml
+++ b/test-cases/frome.yaml
@@ -2,7 +2,7 @@ metadata:
   name: frome
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
     - APT
diff --git a/test-cases/gettext-i18n.yaml b/test-cases/gettext-i18n.yaml
index 667142e761a236ef16d2e0cca55d545248e884a2..5c2ab16b4cb198816c780fe087de0ac593af3b6f 100644
--- a/test-cases/gettext-i18n.yaml
+++ b/test-cases/gettext-i18n.yaml
@@ -2,7 +2,7 @@ metadata:
   name: gettext-i18n
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/glib-gio-fs.yaml b/test-cases/glib-gio-fs.yaml
index 444c8239002a6c4a3bdc53104c59da7af6b72d03..4ee03af7c622da250e681534ac8ef35fc0d86a93 100644
--- a/test-cases/glib-gio-fs.yaml
+++ b/test-cases/glib-gio-fs.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/grilo.yaml b/test-cases/grilo.yaml
index 5ea481d46b8b2e65d1b44b881b6efbeaf2226b50..27e392d60b4f6dbc368fbab699d0377a4f48f5bb 100644
--- a/test-cases/grilo.yaml
+++ b/test-cases/grilo.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/gstreamer1-0-decode.yaml b/test-cases/gstreamer1-0-decode.yaml
index 2b2fbabc576972dd8294e063b61218b22f87a598..7e82f40fd7f2a858f3845f40c0cd6628658a322b 100644
--- a/test-cases/gstreamer1-0-decode.yaml
+++ b/test-cases/gstreamer1-0-decode.yaml
@@ -2,7 +2,7 @@ metadata:
   name: gstreamer1-0-decode
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/gupnp-services.yaml b/test-cases/gupnp-services.yaml
index b99548abfced620bb076c4d9a9f525aea68d3b76..3549a5225f7e980af474382bc8d9e3f4be7b711d 100644
--- a/test-cases/gupnp-services.yaml
+++ b/test-cases/gupnp-services.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/image-bootable.yaml b/test-cases/image-bootable.yaml
index 72e776014998d53820187b1c2a82c5419f4d3862..4403d21423b1cf81e8e5581c5cf27148f2eec8cd 100644
--- a/test-cases/image-bootable.yaml
+++ b/test-cases/image-bootable.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/image-gui-start.yaml b/test-cases/image-gui-start.yaml
index 57146db91f17901c1a3f94c855cae4ec9ecdc3f3..a4358c7845f053a2957e1da8b8b6a6048a1392db 100644
--- a/test-cases/image-gui-start.yaml
+++ b/test-cases/image-gui-start.yaml
@@ -2,7 +2,7 @@ metadata:
   name: image-gui-start
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/iptables-basic.yaml b/test-cases/iptables-basic.yaml
index 6dd54c2caa7656918ba53043b04b12a66e5a0fea..9e552b8558dcc4318791db4cab2cd76a884abe5b 100644
--- a/test-cases/iptables-basic.yaml
+++ b/test-cases/iptables-basic.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/iptables-nmap.yaml b/test-cases/iptables-nmap.yaml
index 1ad128a4a5cfdbb2cece3474650db6f5e7d71a45..4a5daf7dde1ad4b50e99f7e48804bb554561b331 100644
--- a/test-cases/iptables-nmap.yaml
+++ b/test-cases/iptables-nmap.yaml
@@ -2,7 +2,7 @@ metadata:
   name: iptables-nmap
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/newport.yaml b/test-cases/newport.yaml
index a1ac929a680efe920ec1184dc5bde09d4c4337ea..31c0da50029f55c9496f9c6cf090200c6243451e 100644
--- a/test-cases/newport.yaml
+++ b/test-cases/newport.yaml
@@ -2,7 +2,7 @@ metadata:
   name: newport
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
     - APT
diff --git a/test-cases/ofono-sms-receive.yaml b/test-cases/ofono-sms-receive.yaml
index 29b16f5ab62853525ae118e76ce1786239f97f54..8a6f82a475880b53fc56a484bed7a51fec562175 100644
--- a/test-cases/ofono-sms-receive.yaml
+++ b/test-cases/ofono-sms-receive.yaml
@@ -2,7 +2,7 @@ metadata:
   name: ofono-sms-receive
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/ofono-sms-send.yaml b/test-cases/ofono-sms-send.yaml
index 02ad08fc56d7121b2ee1245e2eccc408f24d45ee..50bd3803aefa375dba9e2ac1d1257250a5d73f4f 100644
--- a/test-cases/ofono-sms-send.yaml
+++ b/test-cases/ofono-sms-send.yaml
@@ -2,7 +2,7 @@ metadata:
   name: ofono-sms-send
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/ostree-collection-id.yaml b/test-cases/ostree-collection-id.yaml
index fc38e3043e767e2e8cc4efb6fe25699bf8ca9d73..ded2089a5e9616bef6191f325d3f4a7192b93d6b 100644
--- a/test-cases/ostree-collection-id.yaml
+++ b/test-cases/ostree-collection-id.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
   image-deployment:
     - OSTree
   type: functional
diff --git a/test-cases/polkit-parsing.yaml b/test-cases/polkit-parsing.yaml
index 267ab70f51206492f26b4e9d60c4636fc1573fbd..d67de5763eb7b316204ce7a839fc98b8d22bbeb8 100644
--- a/test-cases/polkit-parsing.yaml
+++ b/test-cases/polkit-parsing.yaml
@@ -2,7 +2,7 @@ metadata:
   name: polkit-parsing
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/rfkill-toggle.yaml b/test-cases/rfkill-toggle.yaml
index d94bd598626a3e0130c189d0ede02c1933a9adc6..a62479d5cdef9133ff9a17bc7e7cb6ff974a4bc6 100644
--- a/test-cases/rfkill-toggle.yaml
+++ b/test-cases/rfkill-toggle.yaml
@@ -2,7 +2,7 @@ metadata:
   name: rfkill-toggle
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
   image-deployment:
     - APT
     - OSTree
diff --git a/test-cases/rhosydd.yaml b/test-cases/rhosydd.yaml
index f3ded47020d52e0d2a913cff84a7f0fe5fb896ea..55ec1414a5b62c3e6f7a4bf589eb3bde3b4be144 100644
--- a/test-cases/rhosydd.yaml
+++ b/test-cases/rhosydd.yaml
@@ -2,7 +2,7 @@ metadata:
   name: rhosydd
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
     - APT
diff --git a/test-cases/ribchester.yaml b/test-cases/ribchester.yaml
index 7616629ed31a4307c5ea813753c677a922cd4b88..3305101d5d89bdc326bea92391d5afece62f488b 100644
--- a/test-cases/ribchester.yaml
+++ b/test-cases/ribchester.yaml
@@ -2,7 +2,7 @@ metadata:
   name: ribchester
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
     - APT
diff --git a/test-cases/sanity-check-manual.yaml b/test-cases/sanity-check-manual.yaml
index 3a1dbe6a4adbf7a7c1fab8c7763a0b41dfaef08f..760bf7b029641ded70389c6fdb24cbef82a7f87a 100644
--- a/test-cases/sanity-check-manual.yaml
+++ b/test-cases/sanity-check-manual.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/sanity-check.yaml b/test-cases/sanity-check.yaml
index 0f88a395c38fd55123e519ded68544d09166a982..1fb972af63bc3266ffaf1508e61cc7b9e1fd65b3 100644
--- a/test-cases/sanity-check.yaml
+++ b/test-cases/sanity-check.yaml
@@ -3,7 +3,7 @@ metadata:
   format: "Apertis Test Definition 1.0"
   image-types:
     minimal: [ armhf-internal, armhf, arm64, amd64 ]
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/telepathy-ring.yaml b/test-cases/telepathy-ring.yaml
index ae984b84bac1b357efb46d290d47ba4c007a888c..367c46e10f4356a5775d7b1a8535b849e422190f 100644
--- a/test-cases/telepathy-ring.yaml
+++ b/test-cases/telepathy-ring.yaml
@@ -2,7 +2,7 @@ metadata:
   name: telepathy-ring
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
     - APT
diff --git a/test-cases/tracker-indexing-local-storage.yaml b/test-cases/tracker-indexing-local-storage.yaml
index 8ce8fed8d617f0711e156904afbe9257b5838b7a..16fd73268e7f23bbdbe413804c05feecfcdfaaf4 100644
--- a/test-cases/tracker-indexing-local-storage.yaml
+++ b/test-cases/tracker-indexing-local-storage.yaml
@@ -2,7 +2,7 @@ metadata:
   name: tracker-indexing-local-storage
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
     - APT
diff --git a/test-cases/tracker-indexing-mass-storage.yaml b/test-cases/tracker-indexing-mass-storage.yaml
index 76fd7aaf537f158d6a6b8a3fd029826a3d95c1e6..f4e536504c88557d9172183d7d31331f8309fa94 100644
--- a/test-cases/tracker-indexing-mass-storage.yaml
+++ b/test-cases/tracker-indexing-mass-storage.yaml
@@ -2,7 +2,7 @@ metadata:
   name: tracker-indexing-mass-storage
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/traffic-control-basic.yaml b/test-cases/traffic-control-basic.yaml
index adaaa34bada4c9c9e0a44c4e6a03d330796e2983..201c4e4c0992e225eaf5338158177758b2753575 100644
--- a/test-cases/traffic-control-basic.yaml
+++ b/test-cases/traffic-control-basic.yaml
@@ -2,7 +2,7 @@ metadata:
   name: traffic-control-basic
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/traprain.yaml b/test-cases/traprain.yaml
index 9849c91aea5fa4e4362ff02f2d20bb60f125db77..8c0967edd8d1618cb8f775c6fa2c469e77cdef31 100644
--- a/test-cases/traprain.yaml
+++ b/test-cases/traprain.yaml
@@ -2,7 +2,7 @@ metadata:
   name: traprain
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
     - APT
diff --git a/test-cases/video-animation-on-boot.yaml b/test-cases/video-animation-on-boot.yaml
index aa78643bed3ced43c21050766dec1504e2ca6850..fb737b11f6d52d958826c676e86ea007d12ba2eb 100644
--- a/test-cases/video-animation-on-boot.yaml
+++ b/test-cases/video-animation-on-boot.yaml
@@ -2,7 +2,7 @@ metadata:
   name: video-animation-on-boot
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/webkit2gtk-ac-3d-rendering.yaml b/test-cases/webkit2gtk-ac-3d-rendering.yaml
index f26f3c499aa4c4941b2e1676c1481a3090c83ccc..7dcb5444d76817638f30f22dac59775198df87c2 100644
--- a/test-cases/webkit2gtk-ac-3d-rendering.yaml
+++ b/test-cases/webkit2gtk-ac-3d-rendering.yaml
@@ -2,7 +2,7 @@ metadata:
   name: webkit2gtk-ac-3d-rendering
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/webkit2gtk-ac-animations.yaml b/test-cases/webkit2gtk-ac-animations.yaml
index be05b7f47a57bd82575e179ad08f66ddc4d68f78..11f32b40c168a53582376126be5d055c1c0cde1a 100644
--- a/test-cases/webkit2gtk-ac-animations.yaml
+++ b/test-cases/webkit2gtk-ac-animations.yaml
@@ -2,7 +2,7 @@ metadata:
   name: webkit2gtk-ac-animations
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/webkit2gtk-ac-scrolling.yaml b/test-cases/webkit2gtk-ac-scrolling.yaml
index 2a1e69aabb706aac757f0e15b8bf5110ab3f0b50..d770a34d5cb9de83703628b9be0259670a6aa5dc 100644
--- a/test-cases/webkit2gtk-ac-scrolling.yaml
+++ b/test-cases/webkit2gtk-ac-scrolling.yaml
@@ -2,7 +2,7 @@ metadata:
   name: webkit2gtk-ac-scrolling
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/webkit2gtk-drag-and-drop.yaml b/test-cases/webkit2gtk-drag-and-drop.yaml
index a53c1527a3c04700a884130e66ce7dc1e4a91979..17a5920cc9c53375413845ae7ce22dab94a4f6cd 100644
--- a/test-cases/webkit2gtk-drag-and-drop.yaml
+++ b/test-cases/webkit2gtk-drag-and-drop.yaml
@@ -2,7 +2,7 @@ metadata:
   name: webkit2gtk-drag-and-drop
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/webkit2gtk-event-handling-redesign.yaml b/test-cases/webkit2gtk-event-handling-redesign.yaml
index be086d42cdd4f01ccce41373d14c7c186e9cc1b6..c8db00bf463a2414917b7be689229715e23543f9 100644
--- a/test-cases/webkit2gtk-event-handling-redesign.yaml
+++ b/test-cases/webkit2gtk-event-handling-redesign.yaml
@@ -2,7 +2,7 @@ metadata:
   name: webkit2gtk-event-handling-redesign
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/webkit2gtk-gstreamer1.0.yaml b/test-cases/webkit2gtk-gstreamer1.0.yaml
index 7ddfb0379b59f03bab69b5efd5664add386711a0..6df1b0fd841f7132102db0bf5e94fc7c41da9223 100644
--- a/test-cases/webkit2gtk-gstreamer1.0.yaml
+++ b/test-cases/webkit2gtk-gstreamer1.0.yaml
@@ -2,7 +2,7 @@ metadata:
   name: webkit2gtk-gstreamer1.0
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment:
diff --git a/test-cases/webkit2gtk-mt-touch-events.yaml b/test-cases/webkit2gtk-mt-touch-events.yaml
index cb387c4102ee0591bff8104097a300bd8b5533b1..dd3fdf8056ee533815d5a891148b07ca3c5b6213 100644
--- a/test-cases/webkit2gtk-mt-touch-events.yaml
+++ b/test-cases/webkit2gtk-mt-touch-events.yaml
@@ -2,7 +2,7 @@ metadata:
   name: webkit2gtk-mt-touch-events
   format: "Apertis Test Definition 1.0"
   image-types:
-    target:  [ armhf-internal, amd64 ]
+    target:  [ armhf-internal, armhf, amd64 ]
     basesdk: [ amd64 ]
     sdk:     [ amd64 ]
   image-deployment: