diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6ee135330a8..98414f9fc83e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -284,6 +284,7 @@ qemuarm64:
       - DISTRO: poky-tiny
         FIRMWARE: [u-boot, edk2]
         TESTING: testimage
+      - TF: tf-rmm
 
 qemuarm-secureboot:
   extends: .build
diff --git a/ci/qemuarm64.yml b/ci/qemuarm64.yml
index 8e394c7f5258..9c696365c05b 100644
--- a/ci/qemuarm64.yml
+++ b/ci/qemuarm64.yml
@@ -6,7 +6,3 @@ header:
     - ci/base.yml
 
 machine: qemuarm64
-
-target:
-  - core-image-minimal
-  - trusted-firmware-rmm
diff --git a/ci/tf-rmm.yml b/ci/tf-rmm.yml
new file mode 100644
index 000000000000..76b95fc936cd
--- /dev/null
+++ b/ci/tf-rmm.yml
@@ -0,0 +1,7 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
+
+header:
+  version: 14
+
+target:
+ - trusted-firmware-rmm