diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d81f66..6ad2f0b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,8 +62,8 @@ base-images:
       - RECIPE:
           - base.yml
           # - base-nvidia.yml
-          - base-cosmic.yml
-          - base-cosmic-nvidia.yml
+          # - base-cosmic.yml
+          # - base-cosmic-nvidia.yml
           - base-kinoite.yml
           - base-kinoite-nvidia.yml
           - base-combo.yml
@@ -111,6 +111,8 @@ combo-images:
   extends:
     - .build
   stage: build
+  variables:
+    BB_BUILD_RECHUNK_CLEAR_PLAN: 'true'
   needs:
     - job: 'base-images: [base-combo.yml]'
       optional: true
@@ -123,6 +125,8 @@ combo-nvidia-images:
   extends:
     - .build
   stage: build
+  variables:
+    BB_BUILD_RECHUNK_CLEAR_PLAN: 'true'
   needs:
     - job: 'base-images: [base-combo-nvidia.yml]'
       optional: true
diff --git a/recipes/common/common.yml b/recipes/common/common.yml
index 000a31d..a6c8357 100644
--- a/recipes/common/common.yml
+++ b/recipes/common/common.yml
@@ -1,2 +1,3 @@
 modules:
   - type: signing
+  - from-file: common/ms-fonts.yml
diff --git a/recipes/common/ms-fonts.yml b/recipes/common/ms-fonts.yml
index ec17fe0..85a7bb6 100644
--- a/recipes/common/ms-fonts.yml
+++ b/recipes/common/ms-fonts.yml
@@ -5,4 +5,6 @@ modules:
         - cabextract
         - xorg-x11-font-utils
         - fontconfig
-        - https://downloads.sourceforge.net/project/mscorefonts2/rpms/msttcore-fonts-installer-2.6-1.noarch.rpm
+  - type: script
+    snippets:
+      - rpm -i --nodigest https://downloads.sourceforge.net/project/mscorefonts2/rpms/msttcore-fonts-installer-2.6-1.noarch.rpm
diff --git a/recipes/cp-laptop.yml b/recipes/cp-laptop.yml
index e42cbe7..cc8a6c5 100644
--- a/recipes/cp-laptop.yml
+++ b/recipes/cp-laptop.yml
@@ -28,7 +28,6 @@ modules:
   - type: script
     scripts:
       - install-archipelago.sh
-  - from-file: common/ms-fonts.yml
   - from-file: common/updates.yml
   - from-file: common/spyro2-rando-client.yaml
   - from-file: common/post-build.yml
diff --git a/recipes/pg-desktop-nvidia.yml b/recipes/pg-desktop-nvidia.yml
index fbce069..a00e9eb 100644
--- a/recipes/pg-desktop-nvidia.yml
+++ b/recipes/pg-desktop-nvidia.yml
@@ -7,7 +7,6 @@ description: The image of Wunker OS for PG's desktop gaming.
 modules:
   - from-file: common/common.yml
   - from-file: common/updates.yml
-  - from-file: common/ms-fonts.yml
   - from-file: common/gaming.yml
   - type: dnf
     install: