diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e33b290..f003270 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,16 +55,15 @@ base-images:
     matrix:
       - RECIPE:
           - base.yml
-          # - base-nvidia.yml
-          # - base-cosmic.yml
-          # - base-cosmic-nvidia.yml
-          # - base-combo.yml
-          # - base-combo-nvidia.yml
-          # - base-kinoite.yml
-          # - base-kinoite-nvidia.yml
+          - base-nvidia.yml
+          - base-cosmic.yml
+          - base-cosmic-nvidia.yml
+          - base-combo.yml
+          - base-combo-nvidia.yml
+          - base-kinoite.yml
+          - base-kinoite-nvidia.yml
         BB_BUILD_PUSH: 'true'
         BB_BUILD_RECHUNK: 'true'
-        TAG: 340-feat-multiarch
 
 legacy-build-images:
   extends:
@@ -92,3 +91,4 @@ build-images:
           - jp-desktop-nvidia.yml
           - jp-laptop.yml
         BB_BUILD_PUSH: 'true'
+        TAG: 340-feat-multiarch
diff --git a/recipes/base.yml b/recipes/base.yml
index 9e980f4..d97a2ba 100644
--- a/recipes/base.yml
+++ b/recipes/base.yml
@@ -4,9 +4,6 @@ name: cosmic
 base-image: quay.io/fedora-ostree-desktops/base-atomic
 image-version: 42
 description: The base image of Wunker OS
-platforms:
-  - linux/amd64
-  - linux/arm64
 modules:
   - from-file: base/common.yml
   - type: os-release
diff --git a/recipes/jp-desktop-nvidia.yml b/recipes/jp-desktop-nvidia.yml
index 5400fc9..ae1f09f 100644
--- a/recipes/jp-desktop-nvidia.yml
+++ b/recipes/jp-desktop-nvidia.yml
@@ -11,6 +11,9 @@ base-image: registry.gitlab.com/wunker-bunker/wunker-os/combo-nvidia
 image-version: 42
 description: The image of Wunker OS for JP's desktop gaming.
 blue-build-tag: none
+platforms:
+  - linux/amd64
+  - linux/arm64
 nushell-version: none
 stages:
   - from-file: common/helix.yml