diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4afd95b..e49b3d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,10 +20,11 @@ variables:
   RUST_LOG_STYLE: always
   BB_SIGNING_DRIVER: sigstore
   BB_CACHE_LAYERS: 'true'
+  BB_BUILD_PUSH: 'true'
   CLICOLOR_FORCE: 1
   TAG: main
 
-.build:
+default:
   services:
     - docker:dind
   interruptible: true
@@ -32,6 +33,8 @@ variables:
     - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
     - export COSIGN_PRIVATE_KEY=$(cat .secure_files/cosign.key)
     - sleep 5
+
+.build:
   script:
     - bluebuild build "./recipes/${RECIPE}"
 
@@ -40,7 +43,6 @@ base-images:
     - .build
   stage: base-images
   variables:
-    BB_BUILD_PUSH: 'true'
     BB_BUILD_RECHUNK: 'true'
   rules:
     # Run when any of the base recipes change
@@ -56,7 +58,7 @@ base-images:
     - when: never
   parallel:
     matrix:
-      - BASE:
+      - RECIPE:
           - base.yml
           # - base-nvidia.yml
           # - base-cosmic.yml
@@ -65,31 +67,54 @@ base-images:
           - base-combo-nvidia.yml
           - base-kinoite.yml
           # - base-kinoite-nvidia.yml
-  script:
-    - bluebuild build "./recipes/${BASE}"
 
-build-images:
+wke-images:
   extends:
     - .build
   stage: build
-  variables:
-    BB_BUILD_PUSH: 'true'
+  needs:
+    - job: 'base-images [base.yml]'
+      optional: true
   parallel:
     matrix:
       - RECIPE:
           - wke-worker.yml
           - wke-fw-desktop.yml
           - wke-server.yml
-        BASE: base.yml
-      - RECIPE: cp-laptop.yml
-        BASE: base-kinoite.yml
-      - RECIPE: jp-desktop-nvidia.yml
-        BASE: base-combo-nvidia.yml
-      - RECIPE: jp-laptop.yml
-        BASE: base-combo.yml
+
+kinoite-images:
+  extends:
+    - .build
+  stage: build
   needs:
-    - job: base-images
+    - job: 'base-images [base-kinoite.yml]'
       optional: true
-      parallel:
-        matrix:
-          - BASE: $BASE
+  parallel:
+    matrix:
+      - RECIPE:
+          - cp-laptop.yml
+
+combo-images:
+  extends:
+    - .build
+  stage: build
+  needs:
+    - job: 'base-images [base-combo.yml]'
+      optional: true
+  parallel:
+    matrix:
+      - RECIPE:
+          - jp-laptop.yml
+
+combo-nvidia-images:
+  extends:
+    - .build
+  stage: build
+  needs:
+    - job: 'base-images [base-combo-nvidia.yml]'
+      optional: true
+  parallel:
+    matrix:
+      - RECIPE:
+          - jp-desktop-nvidia.yml
+