diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d08fcf2..206d724 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,15 +12,14 @@
     - for x in `ls $CI_PROJECT_DIR/build/tmp/log/error-report/ | grep error_report_`; do
     - send-error-report -y tmp/log/error-report/$x
     - done
+    - rm -fr $CI_PROJECT_DIR/build
 
 stages:
   - base 
   - parsec
   - multi
-  - alt 
   - musl
   - test
-  - cleanup
 
 .base:
   before_script:
@@ -44,13 +43,6 @@ stages:
   after_script:
     - *after-my-script
 
-.alt:
-  before_script:
-    - *before-my-script
-  stage: alt
-  after_script:
-    - *after-my-script
-
 .musl:
   before_script:
     - *before-my-script
@@ -65,9 +57,6 @@ stages:
   after_script:
     - *after-my-script
 
-.cleanup:
-   stage: cleanup
-
 qemux86:
   extends: .base
   script:
@@ -95,17 +84,12 @@ qemux86-test:
   - kas build --target security-test-image kas/$CI_JOB_NAME.yml
   - kas build -c testimage --target security-test-image kas/$CI_JOB_NAME.yml
 
-qemux86-rm:
-  extends: .cleanup
-  needs: ['qemux86']
-  script:
-    - rm -fr $CI_PROJECT_DIR/build
-
 qemux86-64:
   extends: .base
   script:
   - kas shell kas/$CI_JOB_NAME.yml  -c "bitbake -k security-build-image security-tpm-image security-tpm2-image integrity-image-minimal"
   - kas build --target dm-verity-image-initramfs kas/$CI_JOB_NAME-dm-verify.yml
+  - kas build --target security-build-image kas/$CI_JOB_NAME-alt.yml
 
 qemux86-64-parsec:
   extends: .parsec
@@ -119,18 +103,6 @@ qemux86-64-multi:
   script:
   - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
-qemux86-64-alt:
-  extends: .alt
-  needs: ['qemux86-64-multi']
-  script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
-
-qemux86-64-rm:
-  extends: .cleanup
-  needs: ['qemux86-64']
-  script:
-    - rm -fr $CI_PROJECT_DIR/build
-
 qemuarm:
   extends: .base
   script:
@@ -142,16 +114,11 @@ qemuarm-parsec:
   script:
   - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
-qemuarm-rm:
-  extends: .cleanup
-  needs: ['qemuarm']
-  script:
-    - rm -fr $CI_PROJECT_DIR/build
-
 qemuarm64:
   extends: .base
   script:
   - kas shell kas/$CI_JOB_NAME.yml  -c "bitbake -k security-build-image security-tpm2-image integrity-image-minimal"
+  - kas build --target security-build-image kas/$CI_JOB_NAME-alt.yml
 
 qemuarm64-multi:
   extends: .multi
@@ -159,15 +126,9 @@ qemuarm64-multi:
   script:
   - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
-qemuarm64-alt:
-  extends: .alt
-  needs: ['qemuarm64-multi']
-  script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
-
 qemuarm64-musl:
   extends: .musl
-  needs: ['qemuarm64-alt']
+  needs: ['qemuarm64']
   script:
   - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
@@ -177,12 +138,6 @@ qemuarm64-parsec:
   script:
   - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
-qemuarm64-rm:
-  extends: .cleanup
-  needs: ['qemuarm64']
-  script:
-    - rm -fr $CI_PROJECT_DIR/build
-
 qemuppc:
   extends: .base
   script:
@@ -194,12 +149,6 @@ qemuppc-parsec:
   script:
   - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
-qemuppc-rm:
-  extends: .cleanup
-  needs: ['qemuppc']
-  script:
-    - rm -fr $CI_PROJECT_DIR/build
-
 qemumips64:
   extends: .base
   script:
@@ -211,25 +160,7 @@ qemumips64-multi:
   script:
   - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
-qemumips64-alt:
-  extends: .alt
-  needs: ['qemumips64-multi']
-  script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
-
-qemumips64-rm:
-  extends: .cleanup
-  needs: ['qemumips64']
-  script:
-    - rm -fr $CI_PROJECT_DIR/build
-
 qemuriscv64:
   extends: .base
   script:
   - kas build --target security-build-image kas/$CI_JOB_NAME.yml
-
-qemuriscv64-rm:
-  extends: .cleanup
-  needs: ['qemuriscv64']
-  script:
-    - rm -fr $CI_PROJECT_DIR/build