diff --git a/meta-arm/.gitlab-ci.yml b/meta-arm/.gitlab-ci.yml
index e1b8dd2..15cf4ec 100644
--- a/meta-arm/.gitlab-ci.yml
+++ b/meta-arm/.gitlab-ci.yml
@@ -123,14 +123,18 @@
   extends: .build
   parallel:
     matrix:
-      - TESTING: [testimage, tftf]
+      - FIRMWARE: corstone1000-firmware-only
+        TESTING: [testimage, tftf]
+      - FIRMWARE: none
+        TESTING: testimage
 
 corstone1000-mps3:
   extends: .build
   parallel:
     matrix:
-      - TESTING: [none, tftf]
-
+      - FIRMWARE: corstone1000-firmware-only
+        TESTING: [none, tftf]
+      - FIRMWARE: none
 
 fvp-base:
   extends: .build