diff --git a/atc_renderer/parser.py b/atc_renderer/parser.py
index ce6c2b00755413af4db6a4980842d8b4865cdb63..0f0a7bbdea694cb0c150dab5835cdfcece583da8 100644
--- a/atc_renderer/parser.py
+++ b/atc_renderer/parser.py
@@ -26,7 +26,7 @@ import yaml
 
 from atc_renderer.exceptions import ParserTypeError, ParserMissingFieldError
 
-image_variants = [ "any", "development", "minimal", "SDK", "target", "tiny-lxc" ]
+image_variants = [ "any", "minimal", "target", "basesdk", "sdk", "tiny-lxc" ]
 image_arch = ['any', 'amd64', 'arm64', 'armhf']
 tests_types = ['compatibility', 'functional', 'performance', 'sanity', 'system']
 priorities = ['critical', 'high', 'low', 'medium']
@@ -72,9 +72,18 @@ def _parse_format(test_case, test_case_format):
             # Test case doesn't have this non-mandatory tag, so just continue.
             continue
 
+        if tagf == 'image-variant':
+            if not isinstance(value, list):
+                raise ParserTypeError("Incorrect type for field: " + tagf)
+
+            for e in value:
+                if e not in image_variants:
+                    sys.stderr.write("Warning: value '{}' not found in '{}' for "\
+                                     "field '{}'\n".format(e, valuef, tagf))
+            continue
+
         if type(value) == str and type(valuef) == list:
-            if tagf in ['image-variant' , 'image-arch', 'type',
-                        'exec-type', 'priority']:
+            if tagf in ['image-arch', 'type', 'exec-type', 'priority']:
                 try:
                     valuef.index(value)
                 except ValueError:
diff --git a/atc_renderer/renderer.py b/atc_renderer/renderer.py
index 44fe34466db9dfd00fbd860da3282b95b1db780f..dac953941624bd9d9cedc791078a03d5c4db81e8 100644
--- a/atc_renderer/renderer.py
+++ b/atc_renderer/renderer.py
@@ -108,8 +108,9 @@ def get_template_values(testcase_data):
 
             if mv == 'expected':
                 template_values.update({ mv : parse_list(value) })
-            elif mv == 'image-deployment':
-                template_values.update({ mv.replace('-', '_') : ", ".join(sorted(value)) })
+            elif mv in ['image-deployment', 'image-variant']:
+                template_values.update({ mv.replace('-', '_') :
+                                         ", ".join(sorted(value)) })
             else:
                 # Set the priority_color.
                 if mv == 'priority':
diff --git a/atc_renderer/tests_files/test_file1.html b/atc_renderer/tests_files/test_file1.html
index ffbbffd953af84445bd52f771b4773130e97a657..fe9af3d710b8784b3b5963c9f1728e4fdc6f9674 100644
--- a/atc_renderer/tests_files/test_file1.html
+++ b/atc_renderer/tests_files/test_file1.html
@@ -16,7 +16,7 @@
 	<div class="card-body">
 	  <dl class="row">
 	    <dt class="col-sm-3">Image Variant:</dt>
-	    <dd class="col-sm-9">any</dd>
+	    <dd class="col-sm-9">basesdk, minimal, sdk, target</dd>
 	    <dt class="col-sm-3">Image Architecture:</dt>
 	    <dd class="col-sm-9">any</dd>
 	    <dt class="col-sm-3">Image Deployment:</dt>
diff --git a/atc_renderer/tests_files/test_file1.yaml b/atc_renderer/tests_files/test_file1.yaml
index 6bf0e99e45d11de6ddfa402f177b5aa2958f0c5b..cf8b8d74a6b21646b7108f50be67b59037d7e31f 100644
--- a/atc_renderer/tests_files/test_file1.yaml
+++ b/atc_renderer/tests_files/test_file1.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: sanity-check
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/atc_renderer/tests_files/test_file2.html b/atc_renderer/tests_files/test_file2.html
index 37a263751310a21e92b12ed1733609f42a286519..1aa822c02ec070a2f50ab189d1ff20dd0155cae2 100644
--- a/atc_renderer/tests_files/test_file2.html
+++ b/atc_renderer/tests_files/test_file2.html
@@ -16,7 +16,7 @@
 	<div class="card-body">
 	  <dl class="row">
 	    <dt class="col-sm-3">Image Variant:</dt>
-	    <dd class="col-sm-9">target</dd>
+	    <dd class="col-sm-9">basesdk, sdk, target</dd>
 	    <dt class="col-sm-3">Image Architecture:</dt>
 	    <dd class="col-sm-9">any</dd>
 	    <dt class="col-sm-3">Image Deployment:</dt>
diff --git a/atc_renderer/tests_files/test_file2.yaml b/atc_renderer/tests_files/test_file2.yaml
index 32ced5e7fb236b937d03c8b0162baa8f5e779d72..4550ec71b61805a982887ffbcd520f0b45e9ec21 100644
--- a/atc_renderer/tests_files/test_file2.yaml
+++ b/atc_renderer/tests_files/test_file2.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: webkit2gtk-actor-tiles
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/atc_renderer/tests_files/test_file3.html b/atc_renderer/tests_files/test_file3.html
index c88b3b87f03ef098c642488690b21172be7226bf..1bf53ce119e649035bdfc70be1d3271181430821 100644
--- a/atc_renderer/tests_files/test_file3.html
+++ b/atc_renderer/tests_files/test_file3.html
@@ -16,7 +16,7 @@
 	<div class="card-body">
 	  <dl class="row">
 	    <dt class="col-sm-3">Image Variant:</dt>
-	    <dd class="col-sm-9">any</dd>
+	    <dd class="col-sm-9">basesdk, sdk, target</dd>
 	    <dt class="col-sm-3">Image Architecture:</dt>
 	    <dd class="col-sm-9">any</dd>
 	    <dt class="col-sm-3">Image Deployment:</dt>
diff --git a/atc_renderer/tests_files/test_file3.yaml b/atc_renderer/tests_files/test_file3.yaml
index de4de1b2079072b2d53ec0f31b9cf16c9ab6426f..03420bab972fb3d285c8a3b2b36683eb99f6737e 100644
--- a/atc_renderer/tests_files/test_file3.yaml
+++ b/atc_renderer/tests_files/test_file3.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: bluez-avrcp-volume
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/atc_renderer/tests_files/test_file4.html b/atc_renderer/tests_files/test_file4.html
index 342eb1100846ebf1387c95c02716a392750e722a..ded37d1bdcb1cfc13a213ab25c3c8f3ad9e06a09 100644
--- a/atc_renderer/tests_files/test_file4.html
+++ b/atc_renderer/tests_files/test_file4.html
@@ -16,7 +16,7 @@
 	<div class="card-body">
 	  <dl class="row">
 	    <dt class="col-sm-3">Image Variant:</dt>
-	    <dd class="col-sm-9">target</dd>
+	    <dd class="col-sm-9">basesdk, minimal, sdk, target</dd>
 	    <dt class="col-sm-3">Image Architecture:</dt>
 	    <dd class="col-sm-9">any</dd>
 	    <dt class="col-sm-3">Image Deployment:</dt>
diff --git a/atc_renderer/tests_files/test_file4.yaml b/atc_renderer/tests_files/test_file4.yaml
index efbcc64a017df949266600072300956003aba14c..f985c38572cfbb7f51b751d68825e4d04e28f125 100644
--- a/atc_renderer/tests_files/test_file4.yaml
+++ b/atc_renderer/tests_files/test_file4.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: apparmor
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/atc_renderer/tests_files/test_file5.html b/atc_renderer/tests_files/test_file5.html
index cb8e461041e3f6f4cfb3f395144ab0db85ecb08d..6be132440b71735118a268dd6465bc847d5b23db 100644
--- a/atc_renderer/tests_files/test_file5.html
+++ b/atc_renderer/tests_files/test_file5.html
@@ -16,7 +16,7 @@
 	<div class="card-body">
 	  <dl class="row">
 	    <dt class="col-sm-3">Image Variant:</dt>
-	    <dd class="col-sm-9">any</dd>
+	    <dd class="col-sm-9">sdk, target</dd>
 	    <dt class="col-sm-3">Image Architecture:</dt>
 	    <dd class="col-sm-9">any</dd>
 	    <dt class="col-sm-3">Image Deployment:</dt>
diff --git a/atc_renderer/tests_files/test_file5.yaml b/atc_renderer/tests_files/test_file5.yaml
index 581f2fdf18af87f2861b58686e37bbb1604fc937..9cfeb1eb5f91b666c951834b23cea748771756d6 100644
--- a/atc_renderer/tests_files/test_file5.yaml
+++ b/atc_renderer/tests_files/test_file5.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: ribchester
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/format/format_definition.yaml b/format/format_definition.yaml
index af2e565755751a5a4543fe2c1545cb26fdb40f78..4cec8f76553d44b3750d5baf9b28b82af9d1a34e 100644
--- a/format/format_definition.yaml
+++ b/format/format_definition.yaml
@@ -8,9 +8,9 @@ metadata:
   # version both for manual and automated tests: "Apertis Test Definition 1.0"
   format: "Apertis Test Definition 1.0"
 
-  # Image type:
-  # [ target, minimal, ostree, development, SDK, any ].
-  image-type: target
+  # Image variant:
+  # [ "any", "minimal", "target", "basesdk", "sdk", "tiny-lxc" ]
+  image-variant: target
 
   # Image architecture:
   # [ amd64, arm64, armhf, any ]
diff --git a/format/format_template.yaml b/format/format_template.yaml
index 469b2b6af1ab94543992efdc785aafe5ff849f32..3828d538460bb582e7f30bc039e97fac22a323e0 100644
--- a/format/format_template.yaml
+++ b/format/format_template.yaml
@@ -4,8 +4,8 @@ metadata:
 
   format: "Apertis Test Definition 1.0"
 
-  # [ any, development, minimal, SDK, target, tiny-lxc ].
-  image-type:
+  # [ "any", "minimal", "target", "basesdk", "sdk", "tiny-lxc" ]
+  image-variant:
 
   # [ amd64, arm64, armhf, any ]
   image-arch:
diff --git a/test-cases/abstract-contact-addressbook-creation.yaml b/test-cases/abstract-contact-addressbook-creation.yaml
index 23a90df74f158a0996dc4784b6b523053764af17..d6cf1535b263e6aac462d45dc95402e031aa6697 100644
--- a/test-cases/abstract-contact-addressbook-creation.yaml
+++ b/test-cases/abstract-contact-addressbook-creation.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: abstract-contact-addressbook-creation
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/ade-commands.yaml b/test-cases/ade-commands.yaml
index 884e625c2db1cfad998e0265b5d3fa854fbf64a2..1e47f1e22db8113251833426bc1310fd1a3383d2 100644
--- a/test-cases/ade-commands.yaml
+++ b/test-cases/ade-commands.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: ade-commands
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - basesdk
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/apertis-update-manager-api.yaml b/test-cases/apertis-update-manager-api.yaml
index cb94744d202065ae236ccb6be84897e816fdd391..27d0b029fb630e2fe2a6265bdcdfc6a01664378e 100644
--- a/test-cases/apertis-update-manager-api.yaml
+++ b/test-cases/apertis-update-manager-api.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: apertis-update-manager-api
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
   image-arch: armhf
   image-deployment:
     - OSTree
diff --git a/test-cases/apertis-update-manager-automount.yaml b/test-cases/apertis-update-manager-automount.yaml
index 4d01bc27e7d995c57e00491e6013322baf5bd127..55ed128605fb0c276a7b3c99d04b421eea997484 100644
--- a/test-cases/apertis-update-manager-automount.yaml
+++ b/test-cases/apertis-update-manager-automount.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: apertis-update-manager-auto
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
   image-arch: armhf
   image-deployment:
     - OSTree
diff --git a/test-cases/apertis-update-manager-diskfull.yaml b/test-cases/apertis-update-manager-diskfull.yaml
index 2f27536856a0d3b199d7132090718e9bc3b15243..4c21a4aa920b8a766285dfff4367e0924772b696 100644
--- a/test-cases/apertis-update-manager-diskfull.yaml
+++ b/test-cases/apertis-update-manager-diskfull.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: apertis-update-manager-diskfull
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
   image-arch: armhf
   image-deployment:
     - OSTree
diff --git a/test-cases/apertis-update-manager-manual.yaml b/test-cases/apertis-update-manager-manual.yaml
index 0a7484ccf22af67c96e5b383b37220f93b0f9884..fb6adb69e959264016c07bb3e4e29be9bd5f44c6 100644
--- a/test-cases/apertis-update-manager-manual.yaml
+++ b/test-cases/apertis-update-manager-manual.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: apertis-update-manager
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
   image-arch: armhf
   image-deployment:
     - OSTree
diff --git a/test-cases/apertis-update-manager-powercut.yaml b/test-cases/apertis-update-manager-powercut.yaml
index 254f1f53ae5a3b075608574f13955ba1e59e4b7a..0fe286e6a001a4b7eb9525c1b4a24a24c49c0a72 100644
--- a/test-cases/apertis-update-manager-powercut.yaml
+++ b/test-cases/apertis-update-manager-powercut.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: apertis-update-manager-powercut
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
   image-arch: armhf
   image-deployment:
     - OSTree
diff --git a/test-cases/apertis-update-manager-rollback.yaml b/test-cases/apertis-update-manager-rollback.yaml
index d5e2059b041e8bace291d8bcc5c7a0a7f6f84e6a..0fcc348c68a6c4fd7db782c89ecf2c22f689fdac 100644
--- a/test-cases/apertis-update-manager-rollback.yaml
+++ b/test-cases/apertis-update-manager-rollback.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: apertis-update-manager-rollback
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
   image-arch: armhf
   image-deployment:
     - OSTree
diff --git a/test-cases/apertis-update-manager-usb-unplug.yaml b/test-cases/apertis-update-manager-usb-unplug.yaml
index 3cc2e8a598f7c98f842444f50d0223d3e613d772..43dff55d81dc02b34474d33f019ac8b976f13ba1 100644
--- a/test-cases/apertis-update-manager-usb-unplug.yaml
+++ b/test-cases/apertis-update-manager-usb-unplug.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: apertis-update-manager-usb-unplug
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
   image-arch: armhf
   image-deployment:
     - OSTree
diff --git a/test-cases/apparmor-basic-profiles.yaml b/test-cases/apparmor-basic-profiles.yaml
index 953912a047caa135346baa29d2358819301d95b3..f3fb3befa726b0a649de8739988c7addc9095bbf 100644
--- a/test-cases/apparmor-basic-profiles.yaml
+++ b/test-cases/apparmor-basic-profiles.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: apparmor-basic-profiles
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-bluez-avrcp-volume.yaml b/test-cases/apparmor-bluez-avrcp-volume.yaml
index cdf153b4ee083bf9437e703be979a4b0e9c52837..44445f310494e17ef67bd1a8cc7fe3d31b6a6679 100644
--- a/test-cases/apparmor-bluez-avrcp-volume.yaml
+++ b/test-cases/apparmor-bluez-avrcp-volume.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: apparmor-bluez-avrcp-volume
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - target
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-bluez-setup.yaml b/test-cases/apparmor-bluez-setup.yaml
index 3fbdf9a6b45ac192e84a33d302b5d3d2d0ec3bb3..e79254599984be19d7a8233898600ac6e552524d 100644
--- a/test-cases/apparmor-bluez-setup.yaml
+++ b/test-cases/apparmor-bluez-setup.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: apparmor-bluez-setup
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - target
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-bluez.yaml b/test-cases/apparmor-bluez.yaml
index 2445bd887d5b8505173b71e48c591463457200cd..226a086c83675e4406a08ef8c18d0176c8d4f992 100644
--- a/test-cases/apparmor-bluez.yaml
+++ b/test-cases/apparmor-bluez.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: apparmor-bluez
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - target
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-chaiwala-system.yaml b/test-cases/apparmor-chaiwala-system.yaml
index 3ce9e7341dcb685d3f675c41f04231d6ba2fcbf4..b366f6715bae4550a4a406b204cb19f72ebad4f1 100644
--- a/test-cases/apparmor-chaiwala-system.yaml
+++ b/test-cases/apparmor-chaiwala-system.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: apparmor-chaiwala-system
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-dbus.yaml b/test-cases/apparmor-dbus.yaml
index 126af83262bbade72ebbed8599b70231b876493d..3cb8ff3d97fb71d94c653b19edc0249c27ba7e3c 100644
--- a/test-cases/apparmor-dbus.yaml
+++ b/test-cases/apparmor-dbus.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: apparmor-dbus
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-folks.yaml b/test-cases/apparmor-folks.yaml
index 26b5f8aee891b2e37d037f257a9236cc2dd1b82a..11b1bb9c8c41961de860ce91c2096a7c4cabf6ac 100644
--- a/test-cases/apparmor-folks.yaml
+++ b/test-cases/apparmor-folks.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: apparmor-folks
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - minimal
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-functional-demo.yaml b/test-cases/apparmor-functional-demo.yaml
index 880d43e565cda7f5b68522346dafa492ba8e12ce..31184f62bd019128ba8c6e8f7d110083494d7448 100644
--- a/test-cases/apparmor-functional-demo.yaml
+++ b/test-cases/apparmor-functional-demo.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: apparmor-functional-demo
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-geoclue.yaml b/test-cases/apparmor-geoclue.yaml
index 2fc04cc4ea8bc1dd1f350c1bc886d60e3633258d..36a6325d38cb476fa5b69ef2260b6f8fca534fbb 100644
--- a/test-cases/apparmor-geoclue.yaml
+++ b/test-cases/apparmor-geoclue.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: apparmor-geoclue
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-gstreamer1-0.yaml b/test-cases/apparmor-gstreamer1-0.yaml
index 824b9a572ec9d5fcdbb0d045d8038b2f98e7a108..7457b9911503e6b1ad4208eb7b7c40a90edda62a 100644
--- a/test-cases/apparmor-gstreamer1-0.yaml
+++ b/test-cases/apparmor-gstreamer1-0.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: apparmor-gstreamer1.0
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-ofono.yaml b/test-cases/apparmor-ofono.yaml
index 615bf4df2903796d9dfcd963b9ffbd31b83f481d..16765275bd53ff15540d6e6e4dfeedf6befa72d6 100644
--- a/test-cases/apparmor-ofono.yaml
+++ b/test-cases/apparmor-ofono.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: apparmor-ofono
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - target
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-pulseaudio.yaml b/test-cases/apparmor-pulseaudio.yaml
index d607ed07eeb37dea4161de7a76ed3f515fb16ef9..8ec66e9a06491eba8e2ce97fb5ff05d6794cbfec 100644
--- a/test-cases/apparmor-pulseaudio.yaml
+++ b/test-cases/apparmor-pulseaudio.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: apparmor-pulseaudio
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-session-lockdown-no-deny.yaml b/test-cases/apparmor-session-lockdown-no-deny.yaml
index aa032a5d99d7822ba80abd49a817f328365a8972..83ca9f0b453071f21cb74648a076c62c32aa2e5a 100644
--- a/test-cases/apparmor-session-lockdown-no-deny.yaml
+++ b/test-cases/apparmor-session-lockdown-no-deny.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: apparmor-session-lockdown-no-deny
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-tracker.yaml b/test-cases/apparmor-tracker.yaml
index d4b0f477c7d8b0e127ba07ff8e880c48dc889fc1..d3304567e1e0f925c8845fb7167879fdd5d8fea0 100644
--- a/test-cases/apparmor-tracker.yaml
+++ b/test-cases/apparmor-tracker.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: apparmor-tracker
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-tumbler.yaml b/test-cases/apparmor-tumbler.yaml
index a9a9d8a576cef266d564094657428e501eb075c8..0fa38d88ef7083e4a43d1df8bc9a43864797f29c 100644
--- a/test-cases/apparmor-tumbler.yaml
+++ b/test-cases/apparmor-tumbler.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: apparmor-tumbler
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor-utils.yaml b/test-cases/apparmor-utils.yaml
index 9f476766a43f62def5b66a37008c6fc2499ec967..8a40ee990fecd938db709cce71147e1b34aac91d 100644
--- a/test-cases/apparmor-utils.yaml
+++ b/test-cases/apparmor-utils.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: apparmor-utils
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/apparmor.yaml b/test-cases/apparmor.yaml
index efbcc64a017df949266600072300956003aba14c..f985c38572cfbb7f51b751d68825e4d04e28f125 100644
--- a/test-cases/apparmor.yaml
+++ b/test-cases/apparmor.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: apparmor
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/bluez-avrcp-volume.yaml b/test-cases/bluez-avrcp-volume.yaml
index de4de1b2079072b2d53ec0f31b9cf16c9ab6426f..03420bab972fb3d285c8a3b2b36683eb99f6737e 100644
--- a/test-cases/bluez-avrcp-volume.yaml
+++ b/test-cases/bluez-avrcp-volume.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: bluez-avrcp-volume
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/bluez-hfp.yaml b/test-cases/bluez-hfp.yaml
index 65c203a15da1780beccc3263dadbf33f398c45da..aff5333cea9c9acc3a300b6bc43e49da154790e9 100644
--- a/test-cases/bluez-hfp.yaml
+++ b/test-cases/bluez-hfp.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: bluez-hfp
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/bluez-phone.yaml b/test-cases/bluez-phone.yaml
index d87f6661335fd2e8461f2af5eeb9a91519f38090..e320aa44b517d67ba7e334b9a30d977538452794 100644
--- a/test-cases/bluez-phone.yaml
+++ b/test-cases/bluez-phone.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: bluez-phone
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/bluez-setup.yaml b/test-cases/bluez-setup.yaml
index e8d77bdb437e36aab39f13b40c759ec57e080506..53df07e008f43c6bc6ad76347095ed754606dd71 100644
--- a/test-cases/bluez-setup.yaml
+++ b/test-cases/bluez-setup.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: bluez-setup
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/boot-no-crashes.yaml b/test-cases/boot-no-crashes.yaml
index 0649277b2c3f589079fd0c6ea9f62c4cea84cb54..0f736791cc5c41bd8a94dca5358f715829b19e79 100644
--- a/test-cases/boot-no-crashes.yaml
+++ b/test-cases/boot-no-crashes.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: boot-no-crashes
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/boot-performance.yaml b/test-cases/boot-performance.yaml
index e15596d01ccc26c9aa52e55586d3ee1ca8f5fdf2..3c179acb91ab8049222dfa557d2c8106166ec316 100644
--- a/test-cases/boot-performance.yaml
+++ b/test-cases/boot-performance.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: boot-performance
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/canterbury.yaml b/test-cases/canterbury.yaml
index 2783bee94b60ed3578f48edc81a9bdb5ded1e5c9..8242707bc66e47cf2bba201a10951259db65c443 100644
--- a/test-cases/canterbury.yaml
+++ b/test-cases/canterbury.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: canterbury
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/cgroups-resource-control.yaml b/test-cases/cgroups-resource-control.yaml
index 8441f89845de0fe4cde7647b944ccf3d782eab09..d9ef7974136c7746c4001e0444f23398317ee6db 100644
--- a/test-cases/cgroups-resource-control.yaml
+++ b/test-cases/cgroups-resource-control.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: cgroups-resource-control
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/check-dbus-services.yaml b/test-cases/check-dbus-services.yaml
index 73743381f8b5625cc174fc8dc8fc06d7af8d3910..7301493e3e206b25431d24e34dc0aa709bb1e510 100644
--- a/test-cases/check-dbus-services.yaml
+++ b/test-cases/check-dbus-services.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: check-dbus-services
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/check-tiny-system-container.yaml b/test-cases/check-tiny-system-container.yaml
index fd00d695bd9f68e2923ac58d46817a080a6633ce..4cc1af7c545480dd8ebe7e87cebb5a7697f2763e 100644
--- a/test-cases/check-tiny-system-container.yaml
+++ b/test-cases/check-tiny-system-container.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: check-tiny-system-container
   format: "Apertis Test Definition 1.0"
-  image-variant: tiny-lxc
+  image-variant:
+    - tiny-lxc
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/check-tiny-user-container.yaml b/test-cases/check-tiny-user-container.yaml
index 1614264a95a700f6053d2c355d85c7cd01d20d5f..e9c9eb63a6d675204fd38e64a7be639dd57a0919 100644
--- a/test-cases/check-tiny-user-container.yaml
+++ b/test-cases/check-tiny-user-container.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: check-tiny-user-container
   format: "Apertis Test Definition 1.0"
-  image-variant: tiny-lxc
+  image-variant:
+    - tiny-lxc
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/connman-new-supplicant.yaml b/test-cases/connman-new-supplicant.yaml
index c425800ce521bed20b66b696bdb0be59756f704b..53b2d13b3a550cf8418bace70d38b83c6662730c 100644
--- a/test-cases/connman-new-supplicant.yaml
+++ b/test-cases/connman-new-supplicant.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: connman-new-supplicant
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/connman-pan-network-access.yaml b/test-cases/connman-pan-network-access.yaml
index fc2a17b1c91a1a1c8f40cbbb03b559e1f5332d5f..f0b9be7c32b912ff4169998fc45c7df7437cf980 100644
--- a/test-cases/connman-pan-network-access.yaml
+++ b/test-cases/connman-pan-network-access.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: connman-pan-network-access
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/connman-pan-tethering.yaml b/test-cases/connman-pan-tethering.yaml
index c8909684e81e0e0773ce201838524292312e5fc5..53738e018098ba123674cd5d658e27295d4f226d 100644
--- a/test-cases/connman-pan-tethering.yaml
+++ b/test-cases/connman-pan-tethering.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: connman-pan-tethering
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/connman-services.yaml b/test-cases/connman-services.yaml
index 65dec2040035f55611d155d13f9c8ebb27d5a7a9..201f2bb6539a35049777f12fdae2d50536fc8c15 100644
--- a/test-cases/connman-services.yaml
+++ b/test-cases/connman-services.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: connman-services
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/connman-usb-tethering.yaml b/test-cases/connman-usb-tethering.yaml
index 0a2e7255f81f358afc6ce907f727974666fb6d00..604b24bdda2cb1fdaf7222873753f375ba620420 100644
--- a/test-cases/connman-usb-tethering.yaml
+++ b/test-cases/connman-usb-tethering.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: connman-usb-tethering
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/connman.yaml b/test-cases/connman.yaml
index 2cdfe02e584c3add9bb3a77983d1e75ce9dd8e35..bd1093b262a435d5e4f7546d2e8bea25c038dde9 100644
--- a/test-cases/connman.yaml
+++ b/test-cases/connman.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: connman
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/dbus-dos-reply-time.yaml b/test-cases/dbus-dos-reply-time.yaml
index c57bc2d690b6e1cc1035d4d7dbb0da834714224f..0959e12c2db17256cd75e708fc0cf8964716209b 100644
--- a/test-cases/dbus-dos-reply-time.yaml
+++ b/test-cases/dbus-dos-reply-time.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: dbus-dos-reply-time
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/dbus-installed-tests.yaml b/test-cases/dbus-installed-tests.yaml
index 33f960daa02b482f510c271a45c899a340946046..0b89873d9d2ff2b9cd05b10c3f97ead2b87a3c99 100644
--- a/test-cases/dbus-installed-tests.yaml
+++ b/test-cases/dbus-installed-tests.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: dbus-installed-tests
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/didcot.yaml b/test-cases/didcot.yaml
index 4a6ea24649aaca04caa3d40ee7a79b3ae2a4e688..1c2c20f3e69acd849f9d2557582741824d0e71f9 100644
--- a/test-cases/didcot.yaml
+++ b/test-cases/didcot.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: didcot-service
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/eclipse-plugins-install-target.yaml b/test-cases/eclipse-plugins-install-target.yaml
index 8bdd4692cd3add28171c755383522bc4e3250e4c..9a42dc819107aaef6118ae115395d2486b2d8426 100644
--- a/test-cases/eclipse-plugins-install-target.yaml
+++ b/test-cases/eclipse-plugins-install-target.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: eclipse-plugins-install-target
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/eclipse-plugins-remote-debugging.yaml b/test-cases/eclipse-plugins-remote-debugging.yaml
index 5100c2aca99a8db5be48fd516b702ebcceb3e5ba..becea6191ef4231217ffc3198df02df3e5f6bddc 100644
--- a/test-cases/eclipse-plugins-remote-debugging.yaml
+++ b/test-cases/eclipse-plugins-remote-debugging.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: eclipse-plugins-remote-debugging
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/eclipse-sysroot-management.yaml b/test-cases/eclipse-sysroot-management.yaml
index 63c488980fffc27ee242e95114296ee81407b3ef..048edf4a2ad4265e1c19ca22a9fcc2ef4dc7770e 100644
--- a/test-cases/eclipse-sysroot-management.yaml
+++ b/test-cases/eclipse-sysroot-management.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: eclipse-sysroot-management
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/evolution-sync-bluetooth.yaml b/test-cases/evolution-sync-bluetooth.yaml
index 40df9edb26d48455bb5ed0bdc525912a75454a52..948a58045f097f8ec492752a817497169df3ffac 100644
--- a/test-cases/evolution-sync-bluetooth.yaml
+++ b/test-cases/evolution-sync-bluetooth.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: evolution-sync-bluetooth
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/folks-alias-persistence.yaml b/test-cases/folks-alias-persistence.yaml
index 54c247b6374a9d60125d9468514e0717c8e1e58b..42cfede21b242bc69b94bda6a52945fbeecf31d6 100644
--- a/test-cases/folks-alias-persistence.yaml
+++ b/test-cases/folks-alias-persistence.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: folks-alias-persistence
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/folks-eds-compatibility.yaml b/test-cases/folks-eds-compatibility.yaml
index 1a759b45b3271b29f6acc063b0a91d1b2a46c375..9b618bff77bfc1651d132c8bb31abbf9805ca8bb 100644
--- a/test-cases/folks-eds-compatibility.yaml
+++ b/test-cases/folks-eds-compatibility.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: folks-eds-compatibility
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/folks-extended-info.yaml b/test-cases/folks-extended-info.yaml
index 33506ba30b37b5ae280fc7a2b9ecafb6efa55fcc..245384b2bd62955aa36f9b18a37be0d3b4c080ad 100644
--- a/test-cases/folks-extended-info.yaml
+++ b/test-cases/folks-extended-info.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: folks-extended-info
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/folks-metacontacts-antilinking.yaml b/test-cases/folks-metacontacts-antilinking.yaml
index 49bdea2597e2867c0a28a0a7cf3bc338200970dd..23c7cc5b200c92bed162e87d55d24c5057546960 100644
--- a/test-cases/folks-metacontacts-antilinking.yaml
+++ b/test-cases/folks-metacontacts-antilinking.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: folks-metacontacts-antilinking
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/folks-metacontacts-linking.yaml b/test-cases/folks-metacontacts-linking.yaml
index 7314c067a28aa5c50ffd6f3782d6febd0eb11fb4..377dbfe4bdc627c569426c72b827f6456d5f689c 100644
--- a/test-cases/folks-metacontacts-linking.yaml
+++ b/test-cases/folks-metacontacts-linking.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: folks-metacontacts-linking
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/folks-metacontacts-unlinking.yaml b/test-cases/folks-metacontacts-unlinking.yaml
index 1702d9e909b0ce7ff342046daeebe6b7bf202b81..90fad26c58dc117908bc18b7c43e1141c5a26fe1 100644
--- a/test-cases/folks-metacontacts-unlinking.yaml
+++ b/test-cases/folks-metacontacts-unlinking.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: folks-metacontacts-unlinking
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/folks-ofono-backend.yaml b/test-cases/folks-ofono-backend.yaml
index 6e2de932fdfc6c71810a79d2848a174bd9191bc3..cb4cc089bfb75321693f404875b10435e7c46c17 100644
--- a/test-cases/folks-ofono-backend.yaml
+++ b/test-cases/folks-ofono-backend.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: folks-ofono-backend
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/folks-search-contacts.yaml b/test-cases/folks-search-contacts.yaml
index ea6b9c3ce3461c150d06e54867ba6f40be20fe97..2c5f00e945fe6c4a77c4bec2a2b704435ac8cf68 100644
--- a/test-cases/folks-search-contacts.yaml
+++ b/test-cases/folks-search-contacts.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: folks-search-contacts
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/folks-sync-only.yaml b/test-cases/folks-sync-only.yaml
index 5fad2845f1402a70cfd5f3043d9a0afbb2781948..162ec402d00ff9f84fdad3746ace8123ef89a97e 100644
--- a/test-cases/folks-sync-only.yaml
+++ b/test-cases/folks-sync-only.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: folks-sync-only
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/frome.yaml b/test-cases/frome.yaml
index 7ba2f1801857cae915f7734089d1bc8d489eee7e..f6880b243e82643bec15795885697139376636d0 100644
--- a/test-cases/frome.yaml
+++ b/test-cases/frome.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: frome
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/gettext-i18n.yaml b/test-cases/gettext-i18n.yaml
index 683149ee1c4e3eab24ef1bb31755584e6048b4e4..29ba28672d0abba335dc99e315383e0b0ab8198d 100644
--- a/test-cases/gettext-i18n.yaml
+++ b/test-cases/gettext-i18n.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: gettext-i18n
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/glib-gio-fs.yaml b/test-cases/glib-gio-fs.yaml
index 0b56f9162b541936bd370905154d95f97672c254..3aa3fd56f53520d136ecc4e840b163d7dc1530c9 100644
--- a/test-cases/glib-gio-fs.yaml
+++ b/test-cases/glib-gio-fs.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: glib-gio-fs
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/grilo.yaml b/test-cases/grilo.yaml
index 06a4f9dd0d264745f5098475354f7bc657dbc4de..7dfb6b7d44852bd7ae5384f55631574750731e98 100644
--- a/test-cases/grilo.yaml
+++ b/test-cases/grilo.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: grilo
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/gstreamer1-0-decode.yaml b/test-cases/gstreamer1-0-decode.yaml
index 3f758c8dba57ff1d31a9a88b7be3a913cf9b41bf..cdef929638486d24a46ef35f3f7be225c0d2ebfd 100644
--- a/test-cases/gstreamer1-0-decode.yaml
+++ b/test-cases/gstreamer1-0-decode.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: gstreamer1.0-decode
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/gupnp-services.yaml b/test-cases/gupnp-services.yaml
index a336fb2c15a7475d1c6c66a2ebc355c36d33baac..e8c7f868d1a82ef40e4633fcb124ce19f04fdae7 100644
--- a/test-cases/gupnp-services.yaml
+++ b/test-cases/gupnp-services.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: gupnp-services
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/image-bootable.yaml b/test-cases/image-bootable.yaml
index 62e98604927cd23ebb81a18d01b2397c01a7bb3e..01c6f10ba2659717172161dea88b9294f2bcd40b 100644
--- a/test-cases/image-bootable.yaml
+++ b/test-cases/image-bootable.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: image-bootable
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/image-gui-start.yaml b/test-cases/image-gui-start.yaml
index 63fea31fe04016ec7d7326a87d624b76de3ff7b1..0ab7784b8274482da77dda2421960c1412e361d4 100644
--- a/test-cases/image-gui-start.yaml
+++ b/test-cases/image-gui-start.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: image-gui-start
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/iptables-basic.yaml b/test-cases/iptables-basic.yaml
index 1c6eac824bcc419bc2bc125b10e9f0792034069c..e7945f378c343a746a60930df047089d63b8bc33 100644
--- a/test-cases/iptables-basic.yaml
+++ b/test-cases/iptables-basic.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: iptables-basic
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/iptables-nmap.yaml b/test-cases/iptables-nmap.yaml
index e5981d1769091769060cfc1b21f3cf8caf8b90fe..a711e3a41df68b4ab9cdadc0f9964d8d29cc6ee9 100644
--- a/test-cases/iptables-nmap.yaml
+++ b/test-cases/iptables-nmap.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: iptables-nmap
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/libsoup-unit.yaml b/test-cases/libsoup-unit.yaml
index 62d151572b88f304aeea4ac63ce64263139253a8..39237786d42f603a966b27f40746febd73ee3644 100644
--- a/test-cases/libsoup-unit.yaml
+++ b/test-cases/libsoup-unit.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: libsoup-unit
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/newport.yaml b/test-cases/newport.yaml
index 83ea97dc765fb402239a33529a26a5153bf8b18f..2a16ac04d349125dd6dde036107c2dd76f4c9ac6 100644
--- a/test-cases/newport.yaml
+++ b/test-cases/newport.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: newport
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/ofono-sms-receive.yaml b/test-cases/ofono-sms-receive.yaml
index a7f01817f8901d02cf6a25ec5546f931a4010f57..5938eda578d4135616011edd70ca8b9efeab1149 100644
--- a/test-cases/ofono-sms-receive.yaml
+++ b/test-cases/ofono-sms-receive.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: ofono-sms-receive
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/ofono-sms-send.yaml b/test-cases/ofono-sms-send.yaml
index ab32abfa5c03c1ef389f186c3cdff8b87ee712d4..28dcc48ad9501f2c7a9667eab43f1ea6f11dcc6a 100644
--- a/test-cases/ofono-sms-send.yaml
+++ b/test-cases/ofono-sms-send.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: ofono-sms-send
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/polkit-parsing.yaml b/test-cases/polkit-parsing.yaml
index d680f15107c02e01870c893befae0e44c6a54ca7..c9d22df9833f5eec1f7f7e721eaac45c8e353b3f 100644
--- a/test-cases/polkit-parsing.yaml
+++ b/test-cases/polkit-parsing.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: polkit-parsing
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/rfkill-toggle.yaml b/test-cases/rfkill-toggle.yaml
index 4f6aa09000e49b53e5d6b78da9a4cfdae48b37da..0175f476134f75f2f463cf8d22091dff695f056a 100644
--- a/test-cases/rfkill-toggle.yaml
+++ b/test-cases/rfkill-toggle.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: rfkill-toggle
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - target
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/rhosydd.yaml b/test-cases/rhosydd.yaml
index c32d24b9d73b2f24f4450eea5316e0f8a63c1b43..53d18ddd795c29e24b5de93eea8ce4cf51dd6629 100644
--- a/test-cases/rhosydd.yaml
+++ b/test-cases/rhosydd.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: rhosydd
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/ribchester.yaml b/test-cases/ribchester.yaml
index 581f2fdf18af87f2861b58686e37bbb1604fc937..9cfeb1eb5f91b666c951834b23cea748771756d6 100644
--- a/test-cases/ribchester.yaml
+++ b/test-cases/ribchester.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: ribchester
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/sanity-check.yaml b/test-cases/sanity-check.yaml
index 6bf0e99e45d11de6ddfa402f177b5aa2958f0c5b..cf8b8d74a6b21646b7108f50be67b59037d7e31f 100644
--- a/test-cases/sanity-check.yaml
+++ b/test-cases/sanity-check.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: sanity-check
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/sdk-ade-remote-debugging.yaml b/test-cases/sdk-ade-remote-debugging.yaml
index be05d39fd76d0b1ebda9990eb8bcbea4abb73e2b..6cab9c96bd8f5cd6de29a9f694a4d9a9055d71f6 100644
--- a/test-cases/sdk-ade-remote-debugging.yaml
+++ b/test-cases/sdk-ade-remote-debugging.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: sdk-ade-remote-debugging
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - basesdk
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/sdk-code-analysis-tools-gcov.yaml b/test-cases/sdk-code-analysis-tools-gcov.yaml
index 6ac6e7dc9df00bb9e585485bcf50c12c2f35a182..67466a7fe37b2888dd806a15bbb5d5f3adc092b1 100644
--- a/test-cases/sdk-code-analysis-tools-gcov.yaml
+++ b/test-cases/sdk-code-analysis-tools-gcov.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: sdk-code-analysis-tools-gcov
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - basesdk
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/sdk-code-analysis-tools-splint.yaml b/test-cases/sdk-code-analysis-tools-splint.yaml
index a5a1917794205453ea75e7c7486cc64adeaf74de..ee69e0c07e00ebb55a9b2a35cad944461d7eb817 100644
--- a/test-cases/sdk-code-analysis-tools-splint.yaml
+++ b/test-cases/sdk-code-analysis-tools-splint.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: sdk-code-analysis-tools-splint
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - basesdk
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/sdk-cross-compilation.yaml b/test-cases/sdk-cross-compilation.yaml
index fa2a0f1682e4b225fa80d93de15d6ffca8b41e86..ddd545043e1b54d23149613e38c2440e56a3e0ea 100644
--- a/test-cases/sdk-cross-compilation.yaml
+++ b/test-cases/sdk-cross-compilation.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: sdk-cross-compilation
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/sdk-dbus-tools-bustle.yaml b/test-cases/sdk-dbus-tools-bustle.yaml
index 369112f8549cd5c63a19cb6efa460eed841c4ebf..75263c10ad020ab0604e6c67383b326210dcb60e 100644
--- a/test-cases/sdk-dbus-tools-bustle.yaml
+++ b/test-cases/sdk-dbus-tools-bustle.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: sdk-dbus-tools-bustle
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - basesdk
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/sdk-dbus-tools-d-feet.yaml b/test-cases/sdk-dbus-tools-d-feet.yaml
index 04645974b5ebd598e522c4bc7f8328447d3b6966..aa7128ca868fbbe05256323d8435a7b8358074b3 100644
--- a/test-cases/sdk-dbus-tools-d-feet.yaml
+++ b/test-cases/sdk-dbus-tools-d-feet.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: sdk-dbus-tools-d-feet
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - basesdk
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/sdk-debug-tools-gdb.yaml b/test-cases/sdk-debug-tools-gdb.yaml
index 06927597c94002ee453726ee48aa461a55171760..c63b0c0af8a6d297c79e85e5522d7a7f3a518f1d 100644
--- a/test-cases/sdk-debug-tools-gdb.yaml
+++ b/test-cases/sdk-debug-tools-gdb.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: sdk-debug-tools-gdb
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - basesdk
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/sdk-debug-tools-strace.yaml b/test-cases/sdk-debug-tools-strace.yaml
index f00bf0f7f15e933e525343b6513ac5f96592364c..e086046a769b4710b936b255ee59c186ca50d416 100644
--- a/test-cases/sdk-debug-tools-strace.yaml
+++ b/test-cases/sdk-debug-tools-strace.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: sdk-debug-tools-strace
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - basesdk
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/sdk-debug-tools-valgrind.yaml b/test-cases/sdk-debug-tools-valgrind.yaml
index 77f95761c23e5d050510bf99f8f4086221135476..1a571bd649c1a3bf11ae9d1f103f3f7abea7b17d 100644
--- a/test-cases/sdk-debug-tools-valgrind.yaml
+++ b/test-cases/sdk-debug-tools-valgrind.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: sdk-debug-tools-valgrind
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - basesdk
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/sdk-ide-build-run-program.yaml b/test-cases/sdk-ide-build-run-program.yaml
index f8f81748ea2d0dca4f8aed95753567157f59d335..a0c71ce7c901d677e6ecf91f3b515e4db2d85a45 100644
--- a/test-cases/sdk-ide-build-run-program.yaml
+++ b/test-cases/sdk-ide-build-run-program.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: sdk-ide-build-run-program
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/sdk-performance-tools-gprof.yaml b/test-cases/sdk-performance-tools-gprof.yaml
index 604da67ff332acbd7b2df38cfed32f3dcf7fcc03..1dd7d2a0b94cc365486ff23e8767f0d286b6090e 100644
--- a/test-cases/sdk-performance-tools-gprof.yaml
+++ b/test-cases/sdk-performance-tools-gprof.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: sdk-performance-tools-gprof
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - basesdk
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/sdk-performance-tools-sysprof.yaml b/test-cases/sdk-performance-tools-sysprof.yaml
index a146ec67499bc7d4e709fc01176c10c93711a2f3..53df078161455da1d620f5d0e3577d472a8e61e3 100644
--- a/test-cases/sdk-performance-tools-sysprof.yaml
+++ b/test-cases/sdk-performance-tools-sysprof.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: sdk-performance-tools-sysprof
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - basesdk
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/sdk-vb-fullscreen.yaml b/test-cases/sdk-vb-fullscreen.yaml
index caed70a1168726d007740c4d6649476423feb558..51d2acfe387c0475dfdefea03d87a9e8a136f122 100644
--- a/test-cases/sdk-vb-fullscreen.yaml
+++ b/test-cases/sdk-vb-fullscreen.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: sdk-vb-fullscreen
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - basesdk
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/telepathy-ring-automated.yaml b/test-cases/telepathy-ring-automated.yaml
index 49f636c4af7e99147c29744606efd9ef7255f7d4..55ca09828d5e9f88e43deec2785beea7e061cb5f 100644
--- a/test-cases/telepathy-ring-automated.yaml
+++ b/test-cases/telepathy-ring-automated.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: telepathy-ring-automated
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT
diff --git a/test-cases/telepathy-ring.yaml b/test-cases/telepathy-ring.yaml
index c5047260bddf79bfb28f6c94cd2cb071e60aed8b..c622b1e11749da18df303e15240970c08564b58d 100644
--- a/test-cases/telepathy-ring.yaml
+++ b/test-cases/telepathy-ring.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: telepathy-ring
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/tracker-indexing-local-storage.yaml b/test-cases/tracker-indexing-local-storage.yaml
index f6111caaffb02056579ebf5cfc55c99c98ef3637..3aac51c0dd62e23b522144361c72fef6bd2010da 100644
--- a/test-cases/tracker-indexing-local-storage.yaml
+++ b/test-cases/tracker-indexing-local-storage.yaml
@@ -1,7 +1,11 @@
 metadata:
   name: tracker-indexing-local-storage
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - minimal
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/tracker-indexing-mass-storage.yaml b/test-cases/tracker-indexing-mass-storage.yaml
index 0442fa0bc94cb6cf627b5c56f21579cd1c079e64..eb90d7e35c45b1b78dd07f700784cfb561fed307 100644
--- a/test-cases/tracker-indexing-mass-storage.yaml
+++ b/test-cases/tracker-indexing-mass-storage.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: tracker-indexing-mass-storage
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/traffic-control-basic.yaml b/test-cases/traffic-control-basic.yaml
index 276be59c66ad2d61281e3a2f5edc3379ebefa373..67f12ef56bf28adc6cf5fa8b4e0f25181889e9b0 100644
--- a/test-cases/traffic-control-basic.yaml
+++ b/test-cases/traffic-control-basic.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: traffic-control-basic
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/traprain.yaml b/test-cases/traprain.yaml
index 5665c36eaaa99b37cb355db93b8105e3ae1f9069..457343187803d6d3f18861d235b1fcd0fd6de180 100644
--- a/test-cases/traprain.yaml
+++ b/test-cases/traprain.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: traprain
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/tumbler-thumbnailing.yaml b/test-cases/tumbler-thumbnailing.yaml
index dd8d1d5ce00508d62c705c7825f3ad4e34dd1434..df7f4b5322c76c6f7b03b00e422a98fc9b5ea96c 100644
--- a/test-cases/tumbler-thumbnailing.yaml
+++ b/test-cases/tumbler-thumbnailing.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: tumbler-thumbnailing
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/video-animation-on-boot.yaml b/test-cases/video-animation-on-boot.yaml
index a89c9a59e17ce6f40029d8e7f968d0d3784ed2ab..bb588f9fff71af9d3f2e9a1ed756d135a022d09c 100644
--- a/test-cases/video-animation-on-boot.yaml
+++ b/test-cases/video-animation-on-boot.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: video-animation-on-boot
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/webkit2gtk-ac-3d-rendering.yaml b/test-cases/webkit2gtk-ac-3d-rendering.yaml
index 7df84e4182939bef95fcc1cb5233e636660f910f..38d0f783ed72b541f5898670e09ae294454da926 100644
--- a/test-cases/webkit2gtk-ac-3d-rendering.yaml
+++ b/test-cases/webkit2gtk-ac-3d-rendering.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: webkit2gtk-ac-3d-rendering
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/webkit2gtk-ac-animations.yaml b/test-cases/webkit2gtk-ac-animations.yaml
index 865b1d996e6bb106204c1f98c973e0822b10dbcd..7b1af5e617e2ff4337bb97dad2520b572c72d989 100644
--- a/test-cases/webkit2gtk-ac-animations.yaml
+++ b/test-cases/webkit2gtk-ac-animations.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: webkit2gtk-ac-animations
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/webkit2gtk-ac-scrolling.yaml b/test-cases/webkit2gtk-ac-scrolling.yaml
index ffc262741514dec39b34fab1ca09461af5e85586..857022a6058a262126ff55b9a551ddb98d2168a6 100644
--- a/test-cases/webkit2gtk-ac-scrolling.yaml
+++ b/test-cases/webkit2gtk-ac-scrolling.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: webkit2gtk-ac-scrolling
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/webkit2gtk-actor-tiles.yaml b/test-cases/webkit2gtk-actor-tiles.yaml
index 32ced5e7fb236b937d03c8b0162baa8f5e779d72..4550ec71b61805a982887ffbcd520f0b45e9ec21 100644
--- a/test-cases/webkit2gtk-actor-tiles.yaml
+++ b/test-cases/webkit2gtk-actor-tiles.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: webkit2gtk-actor-tiles
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/webkit2gtk-aligned-scroll.yaml b/test-cases/webkit2gtk-aligned-scroll.yaml
index 3bb82a6e64eec072cfc152214a715a426b9ce573..d7db3fe267d1357b5fdbbc0b5855db8edc498f5f 100644
--- a/test-cases/webkit2gtk-aligned-scroll.yaml
+++ b/test-cases/webkit2gtk-aligned-scroll.yaml
@@ -1,7 +1,8 @@
 metadata:
   name: webkit2gtk-aligned-scroll
   format: "Apertis Test Definition 1.0"
-  image-variant: target
+  image-variant:
+    - target
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/webkit2gtk-contextual-zoom.yaml b/test-cases/webkit2gtk-contextual-zoom.yaml
index 9f9cc8413f5b84ef3c107361bf7f5c6330fd76fc..12695ae7dd0eaf885c937ddac8bc25ba9bd181ed 100644
--- a/test-cases/webkit2gtk-contextual-zoom.yaml
+++ b/test-cases/webkit2gtk-contextual-zoom.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: webkit2gtk-contextual-zoom
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/webkit2gtk-drag-and-drop.yaml b/test-cases/webkit2gtk-drag-and-drop.yaml
index a2c6d319a39dcfa5b686f11a213b8c618bd14ae8..acf9548d211bcb4dadc25b47e0267ff9243e5fc5 100644
--- a/test-cases/webkit2gtk-drag-and-drop.yaml
+++ b/test-cases/webkit2gtk-drag-and-drop.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: webkit2gtk-drag-and-drop
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/webkit2gtk-event-handling-redesign.yaml b/test-cases/webkit2gtk-event-handling-redesign.yaml
index e4cc491d6e066f4d6878cd0d51d33e095380a216..7623eae6a8ae4aedbfe7754c0a23d0ce9e1cd8fb 100644
--- a/test-cases/webkit2gtk-event-handling-redesign.yaml
+++ b/test-cases/webkit2gtk-event-handling-redesign.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: webkit2gtk-event-handling-redesign
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/webkit2gtk-gstreamer1.0.yaml b/test-cases/webkit2gtk-gstreamer1.0.yaml
index aeb16d35f1d00bfbadcb087db6b9c3d7fe9211df..05e59463f2d7d7ea79eef809f61fee567a5f80af 100644
--- a/test-cases/webkit2gtk-gstreamer1.0.yaml
+++ b/test-cases/webkit2gtk-gstreamer1.0.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: webkit2gtk-gstreamer1.0
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/webkit2gtk-lazy-click.yaml b/test-cases/webkit2gtk-lazy-click.yaml
index cb01a314a25c04bcc65d62ec7344398315e747ff..467a8c7dcf223fddafd760e8c7cb4f25567e51af 100644
--- a/test-cases/webkit2gtk-lazy-click.yaml
+++ b/test-cases/webkit2gtk-lazy-click.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: webkit2gtk-lazy-click
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/webkit2gtk-mt-touch-events.yaml b/test-cases/webkit2gtk-mt-touch-events.yaml
index 879f4fff484b8c921f52069539d3e4bf3b74f09e..0f28f9181ac4ec72d7dac87abdfb0d07684bcd5f 100644
--- a/test-cases/webkit2gtk-mt-touch-events.yaml
+++ b/test-cases/webkit2gtk-mt-touch-events.yaml
@@ -1,7 +1,10 @@
 metadata:
   name: webkit2gtk-mt-touch-events
   format: "Apertis Test Definition 1.0"
-  image-variant: any
+  image-variant:
+    - target
+    - basesdk
+    - sdk
   image-arch: any
   image-deployment:
     - APT
diff --git a/test-cases/x-hw-accelerated.yaml b/test-cases/x-hw-accelerated.yaml
index 05639e075a6e11975db860f62b3ddb50ca3486a8..015c84a0b5e0bfc0e217513c31aaf948be1d8bfd 100644
--- a/test-cases/x-hw-accelerated.yaml
+++ b/test-cases/x-hw-accelerated.yaml
@@ -1,7 +1,9 @@
 metadata:
   name: x-hw-accelerated
   format: "Apertis Test Definition 1.0"
-  image-variant: SDK
+  image-variant:
+    - basesdk
+    - sdk
   image-arch: amd64
   image-deployment:
     - APT