diff --git a/.circleci/config.yml b/.circleci/config.yml
index a95a16b9..eab2c45f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -250,14 +250,6 @@ workflows:
           requires:
             - novacustom-nv4x_adl
 
-      # x230 is based on 24.12 coreboot release here
-      - build_and_persist:
-          name: x230-hotp-maximized
-          target: x230-hotp-maximized
-          subcommand: ""
-          requires:
-            - x86-musl-cross-make
-
       # coreboot talos_2
       - build_and_persist:
           name: UNTESTED_talos-2
@@ -284,54 +276,60 @@ workflows:
 
       # Those onboarding new boards should add their entries below.
       # coreboot 24.12 boards
+      - build:
+          name: x230-hotp-maximized
+          target: x230-hotp-maximized
+          subcommand: ""
+          requires:
+            - x86-musl-cross-make
       - build:
           name: x220-hotp-maximized
           target: x220-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: x220-maximized
           target: x220-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: t420-hotp-maximized
           target: t420-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: t420-maximized
           target: t420-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
-          name: x230-hotp-maximized_usb-kb
-          target: x230-hotp-maximized_usb-kb
+          name: x86-musl-cross-make_usb-kb
+          target: x86-musl-cross-make_usb-kb
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: t430-hotp-maximized
           target: t430-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: x230-maximized
           target: x230-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       #TODO: move away of 24.02.01 coreboot and depend on optiplex specific dasharo commit
       - build:
@@ -339,126 +337,126 @@ workflows:
           target: optiplex-7010_9010-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: optiplex-7010_9010-hotp-maximized
           target: optiplex-7010_9010-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: optiplex-7010_9010_TXT-maximized
           target: optiplex-7010_9010_TXT-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: optiplex-7010_9010_TXT-hotp-maximized
           target: optiplex-7010_9010_TXT-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: x230-maximized-fhd_edp
           target: x230-maximized-fhd_edp
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
-          name: x230-hotp-maximized-fhd_edp
-          target: x230-hotp-maximized-fhd_edp
+          name: x86-musl-cross-make-fhd_edp
+          target: x86-musl-cross-make-fhd_edp
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: w530-hotp-maximized
           target: w530-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: t430-maximized
           target: t430-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: w530-maximized
           target: w530-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: t530-maximized
           target: t530-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: t530-hotp-maximized
           target: t530-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: UNTESTED_t440p-maximized
           target: UNTESTED_t440p-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: UNTESTED_t440p-hotp-maximized
           target: UNTESTED_t440p-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: UNTESTED_w541-maximized
           target: UNTESTED_w541-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: UNTESTED_w541-hotp-maximized
           target: UNTESTED_w541-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: qemu-coreboot-fbwhiptail-tpm2-hotp
           target: qemu-coreboot-fbwhiptail-tpm2-hotp
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: z220-cmt-maximized
           target: z220-cmt-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       - build:
           name: z220-cmt-hotp-maximized
           target: z220-cmt-hotp-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       # coreboot purism
       # librem boards
@@ -517,7 +515,7 @@ workflows:
           target: UNMAINTAINED_t480-maximized
           subcommand: ""
           requires:
-            - x230-hotp-maximized
+            - x86-musl-cross-make
 
       # dasharo release, share 24.02.01 utils/crossgcc
       - build: