diff --git a/.circleci/config.yml b/.circleci/config.yml
index f271c62e..dca31f03 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -314,13 +314,6 @@ workflows:
           requires:
             - t480-hotp-maximized
 
-      - build:
-          name: x230-hotp-maximized_usb-kb
-          target: x230-hotp-maximized_usb-kb
-          subcommand: ""
-          requires:
-            - t480-hotp-maximized
-
       - build:
           name: t430-hotp-maximized
           target: t430-hotp-maximized
@@ -335,7 +328,6 @@ workflows:
           requires:
             - t480-hotp-maximized
 
-      #TODO: move away of 24.02.01 coreboot and depend on optiplex specific dasharo commit
       - build:
           name: optiplex-7010_9010-maximized
           target: optiplex-7010_9010-maximized
@@ -364,6 +356,20 @@ workflows:
           requires:
             - t480-hotp-maximized
 
+      - build:
+          name: x230-hotp-maximized
+          target: x230-hotp-maximized
+          subcommand: ""
+          requires:
+            - t480-hotp-maximized
+
+      - build:
+          name: x230-hotp-maximized_usb-kb
+          target: x230-hotp-maximized_usb-kb
+          subcommand: ""
+          requires:
+            - t480-hotp-maximized
+
       - build:
           name: x230-maximized-fhd_edp
           target: x230-maximized-fhd_edp