diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c715bf..4afd95b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,7 @@ base-images:
     - when: never
   parallel:
     matrix:
-      - RECIPE:
+      - BASE:
           - base.yml
           # - base-nvidia.yml
           # - base-cosmic.yml
@@ -65,18 +65,8 @@ base-images:
           - base-combo-nvidia.yml
           - base-kinoite.yml
           # - base-kinoite-nvidia.yml
-
-legacy-build-images:
-  extends:
-    - .build
-  stage: build
-  variables:
-    BB_BUILD_PUSH: 'true'
-  needs: []
-  parallel:
-    matrix:
-      - RECIPE:
-          - wke-server.yml
+  script:
+    - bluebuild build "./recipes/${BASE}"
 
 build-images:
   extends:
@@ -84,14 +74,22 @@ build-images:
   stage: build
   variables:
     BB_BUILD_PUSH: 'true'
-  needs:
-    - job: base-images
-      optional: true
   parallel:
     matrix:
       - RECIPE:
           - wke-worker.yml
           - wke-fw-desktop.yml
-          - cp-laptop.yml
-          - jp-desktop-nvidia.yml
-          - jp-laptop.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
+  needs:
+    - job: base-images
+      optional: true
+      parallel:
+        matrix:
+          - BASE: $BASE