diff --git a/.circleci/config.yml b/.circleci/config.yml
index 65ee9bf9..7f7f637f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -230,10 +230,10 @@ workflows:
       # Below, sequentially build one board for each coreboot version.
       # The last board in the sequence is the dependency for the parallel boards built at the end, and also save_cache.
 
-      # coreboot 24.02.01
+      # coreboot 24.02.01, base layer cache to be built and reused by all 24.02.01 boards
       - build_and_persist:
-          name: x230-hotp-maximized
-          target: x230-hotp-maximized
+          name: novacustom-nv4x_adl
+          target: novacustom-nv4x_adl
           subcommand: ""
           requires:
             - x86-musl-cross-make
@@ -244,7 +244,7 @@ workflows:
           target: librem_14
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - novacustom-nv4x_adl
 
       # t480 is based on 24.12 coreboot release, not sharing any buildstack from now, depend on muscl-cross cache
       - build_and_persist:
@@ -254,18 +254,6 @@ workflows:
           requires:
             - x86-musl-cross-make
 
-      # coreboot nitropad
-      # Nitropads depending on x230-hotp-maximized cache since kernel is 6.x and coreboot is git is unshared
-      # We use nitropad's coreboot's fork crossgcc
-      # No need to wait further for other board's cache
-      # We reuse built modules from x230-hotp-maximized cache only
-      - build_and_persist:
-          name: novacustom-nv4x_adl
-          target: novacustom-nv4x_adl
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
       # coreboot talos_2
       - build_and_persist:
           name: UNTESTED_talos-2
@@ -288,58 +276,58 @@ workflows:
       - save_cache:
           requires:
             - UNTESTED_talos-2
-            - librem_14
+            - t480-hotp-maximized
 
       # Those onboarding new boards should add their entries below.
-      # coreboot 24.02.01 boards
+      # coreboot 24.12 boards
       - build:
           name: x220-hotp-maximized
           target: x220-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: x220-maximized
           target: x220-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: t420-hotp-maximized
           target: t420-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: t420-maximized
           target: t420-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: x230-hotp-maximized_usb-kb
           target: x230-hotp-maximized_usb-kb
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: t430-hotp-maximized
           target: t430-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: x230-maximized
           target: x230-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       #TODO: move away of 24.02.01 coreboot and depend on optiplex specific dasharo commit
       - build:
@@ -347,127 +335,126 @@ workflows:
           target: optiplex-7010_9010-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: optiplex-7010_9010-hotp-maximized
           target: optiplex-7010_9010-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: optiplex-7010_9010_TXT-maximized
           target: optiplex-7010_9010_TXT-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: optiplex-7010_9010_TXT-hotp-maximized
           target: optiplex-7010_9010_TXT-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: x230-maximized-fhd_edp
           target: x230-maximized-fhd_edp
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: x230-hotp-maximized-fhd_edp
           target: x230-hotp-maximized-fhd_edp
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: w530-hotp-maximized
           target: w530-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: t430-maximized
           target: t430-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: w530-maximized
           target: w530-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: t530-maximized
           target: t530-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: t530-hotp-maximized
           target: t530-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
-
+            - t480-hotp-maximized
 
       - build:
           name: UNTESTED_t440p-maximized
           target: UNTESTED_t440p-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: UNTESTED_t440p-hotp-maximized
           target: UNTESTED_t440p-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: UNTESTED_w541-maximized
           target: UNTESTED_w541-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: UNTESTED_w541-hotp-maximized
           target: UNTESTED_w541-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: qemu-coreboot-fbwhiptail-tpm2-hotp
           target: qemu-coreboot-fbwhiptail-tpm2-hotp
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: z220-cmt-maximized
           target: z220-cmt-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       - build:
           name: z220-cmt-hotp-maximized
           target: z220-cmt-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - t480-hotp-maximized
 
       # coreboot purism
       # librem boards
@@ -520,14 +507,6 @@ workflows:
           requires:
             - librem_14
 
-      # t480 is based on 24.12 coreboot release, not sharing any buildstack from now, depend on muscl-cross cache
-      - build:
-          name: t480-maximized
-          target: t480-maximized
-          subcommand: ""
-          requires:
-            - t480-hotp-maximized
-
       # dasharo release, share 24.02.01 utils/crossgcc
       - build:
           name: UNTESTED_nitropad-ns50
@@ -541,5 +520,5 @@ workflows:
           target: novacustom-v560tu
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - novacustom-nv4x_adl