diff --git a/meta-security/.gitlab-ci.yml b/meta-security/.gitlab-ci.yml
index 1442239..f673ef6 100644
--- a/meta-security/.gitlab-ci.yml
+++ b/meta-security/.gitlab-ci.yml
@@ -26,128 +26,104 @@
 qemux86:
   extends: .build
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME-parsec.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME-comp.yml
+  - kas build --target harden-image-minimal kas/$CI_JOB_NAME-harden.yml
+  - kas build --target integrity-image-minimal kas/$CI_JOB_NAME-ima.yml
 
 qemux86-64:
   extends: .build
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME-parsec.yml
+  - kas build --target dm-verity-image-initramfs kas/$CI_JOB_NAME-dm-verify.yml
+  - kas build --target integrity-image-minimal kas/$CI_JOB_NAME-ima.yml
 
 qemuarm:
   extends: .build
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME-parsec.yml
 
 qemuarm64:
   extends: .build
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME-parsec.yml
+  - kas build --target integrity-image-minimal kas/$CI_JOB_NAME-ima.yml
 
 qemuppc:
   extends: .build
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME-parsec.yml
 
 qemumips64:
   extends: .build
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
 qemuriscv64:
   extends: .build
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
 qemux86-64-tpm:
   extends: .build
   script:
-  - kas build --target security-tpm-image kas/$CI_JOB_NAME.yml 
-
-qemux86-64-tpm2:
-  extends: .build
-  script:
-  - kas build --target security-tpm2-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-tpm-image kas/$CI_JOB_NAME.yml
+  - kas build --target security-tpm2-image kas/$CI_JOB_NAME2.yml
 
 qemuarm64-tpm2:
   extends: .build
   script:
-  - kas build --target security-tpm2-image kas/$CI_JOB_NAME.yml 
-
-qemux86-ima:
-  extends: .build
-  script:
-  - kas build --target integrity-image-minimal kas/$CI_JOB_NAME.yml 
-
-qemux86-64-ima:
-  extends: .build
-  script:
-  - kas build --target integrity-image-minimal kas/$CI_JOB_NAME.yml 
-
-qemuarm64-ima:
-  extends: .build
-  script:
-  - kas build --target integrity-image-minimal kas/$CI_JOB_NAME.yml 
-
-qemux86-64-dm-verify:
-  extends: .build
-  script:
-  - kas build --target core-image-minimal kas/qemux86-64.yml 
-  - kas build --target dm-verity-image-initramfs kas/$CI_JOB_NAME.yml 
-
+  - kas build --target security-tpm2-image kas/$CI_JOB_NAME.yml
 
 qemuarm64-alt:
   extends: .build
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
 qemuarm64-multi:
   extends: .build
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
 qemumips64-alt:
   extends: .build
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
 qemumips64-multi:
   extends: .build
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
 qemux86-64-alt:
   extends: .build
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
 qemux86-64-multi:
   extends: .build
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
 qemux86-musl:
   extends: .build
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
 qemuarm64-musl:
   extends: .build
   script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
-
-qemux86-harden:
-  extends: .build
-  script:
-  - kas build --target harden-image-minimal kas/$CI_JOB_NAME.yml 
-
-qemux86-comp:
-  extends: .build
-  script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
 qemux86-test:
   extends: .build
   allow_failure: true
   script:
-  - kas build --target security-test-image kas/$CI_JOB_NAME.yml 
-  - kas build -c testimage --target security-test-image kas/$CI_JOB_NAME.yml 
+  - kas build --target security-test-image kas/$CI_JOB_NAME.yml
+  - kas build -c testimage --target security-test-image kas/$CI_JOB_NAME.yml
+