diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0395551be7..d5b7755b38 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,9 +33,6 @@ jobs:
   build_novacustom:
     runs-on: ubuntu-22.04
     needs: build_novacustom_ec
-    container:
-      image: coreboot/coreboot-sdk:2023-11-24_2731fa619b
-      options: --user 1001
     strategy:
       matrix:
         vendor: [ novacustom ]
@@ -65,9 +62,7 @@ jobs:
       - name: Build Dasharo
         run: |
           mv ${{ matrix.vendor }}_${{ matrix.model }}_ec.rom ec.rom
-          cp configs/config.${{ matrix.vendor }}_${{ matrix.model }} .config
-          make olddefconfig
-          make
+          ./build.sh ${{ matrix.model }}
       - name: Copy default testing keys for capsules
         run: |
           mkdir keys
@@ -85,9 +80,6 @@ jobs:
           retention-days: 30
   build_optiplex:
     runs-on: ubuntu-22.04
-    container:
-      image: coreboot/coreboot-sdk:2023-11-24_2731fa619b
-      options: --user 1001
     strategy:
       matrix:
         vendor: [ dell ]
@@ -105,9 +97,7 @@ jobs:
         run: git submodule update --init --recursive --checkout
       - name: Build Dasharo
         run: |
-          cp configs/config.${{ matrix.vendor }}_${{ matrix.model }}_txt .config
-          make olddefconfig
-          make
+          ./build.sh ${{ matrix.model }}
       - name: Save artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -117,9 +107,6 @@ jobs:
           retention-days: 30
   build_msi:
     runs-on: ubuntu-22.04
-    container:
-      image: coreboot/coreboot-sdk:2023-11-24_2731fa619b
-      options: --user 1001
     strategy:
       matrix:
         vendor: [ msi ]
@@ -137,9 +124,7 @@ jobs:
         run: git submodule update --init --recursive --checkout
       - name: Build Dasharo
         run: |
-          cp configs/config.${{ matrix.vendor }}_${{ matrix.model }} .config
-          make olddefconfig
-          make
+          ./build.sh ${{ matrix.model }}
           pkcs7sign=payloads/external/edk2/workspace/Dasharo/BaseTools/Source/Python/Pkcs7Sign
           ./capsule.sh make -t "$pkcs7sign"/TestRoot.pub.pem \
                             -o "$pkcs7sign"/TestSub.pub.pem \
@@ -182,9 +167,6 @@ jobs:
           retention-days: 30
   build_pcengines:
     runs-on: ubuntu-22.04
-    container:
-      image: coreboot/coreboot-sdk:2023-11-24_2731fa619b
-      options: --user 1001
     strategy:
       matrix:
         vendor: [ pcengines ]
@@ -203,9 +185,7 @@ jobs:
         run: git submodule update --init --recursive --checkout
       - name: Build Dasharo
         run: |
-          cp configs/config.${{ matrix.vendor }}_${{ matrix.payload }}_${{ matrix.model }} .config
-          make olddefconfig
-          make
+          ./build.sh ${{ matrix.model }}
       - name: Save artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -215,9 +195,6 @@ jobs:
           retention-days: 30
   build_q35:
     runs-on: ubuntu-22.04
-    container:
-      image: coreboot/coreboot-sdk:2023-11-24_2731fa619b
-      options: --user 1001
     strategy:
       matrix:
         vendor: [ emulation_qemu ]
@@ -234,9 +211,7 @@ jobs:
           fetch-depth: 0
       - name: Build Dasharo
         run: |
-          cp configs/config.${{ matrix.vendor }}_${{ matrix.model }}_${{ matrix.payload }} .config
-          make olddefconfig
-          make
+          ./build.sh ${{ matrix.model }}_${{ matrix.payload }}
       - name: Save artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -256,9 +231,6 @@ jobs:
       artifact_name: "dasharo-${{ matrix.vendor }}-${{ matrix.model }}-${{ matrix.payload }}"
   build_hardkernel_odroid_h4:
     runs-on: ubuntu-22.04
-    container:
-      image: coreboot/coreboot-sdk:2024-02-18_732134932b
-      options: --user 1001
     strategy:
       matrix:
         vendor: [ hardkernel ]
@@ -276,9 +248,7 @@ jobs:
         run: git submodule update --init --recursive --checkout
       - name: Build Dasharo
         run: |
-          cp configs/config.${{ matrix.vendor }}_${{ matrix.model }} .config
-          make olddefconfig
-          make
+          ./build.sh ${{ matrix.model }}
       - name: Save artifacts
         uses: actions/upload-artifact@v4
         with:
diff --git a/build.sh b/build.sh
index cc950f74fe..938367ced6 100755
--- a/build.sh
+++ b/build.sh
@@ -315,19 +315,19 @@ fi
 CMD="$1"
 
 case "$CMD" in
-    "ddr4" | "z690a_ddr4")
+    "ddr4" | "z690a_ddr4" | "ms7d25_ddr4")
         BOARD="msi_ms7d25"
         build_msi ddr4 "Z690-A DDR4 "
         ;;
-    "ddr5" | "z690a_ddr5")
+    "ddr5" | "z690a_ddr5" | "ms7d25_ddr5")
         BOARD="msi_ms7d25"
         build_msi ddr5 "Z690-A DDR5 "
         ;;
-    "z790p_ddr4")
+    "z790p_ddr4" | "ms7e06_ddr4")
         BOARD="msi_ms7e06"
         build_msi ddr4 "Z790-P DDR4 "
         ;;
-    "z790p_ddr5")
+    "z790p_ddr5" | "ms7e06_ddr5")
         BOARD="msi_ms7e06"
         build_msi ddr5 "Z790-P DDR5 "
         ;;
@@ -415,18 +415,18 @@ case "$CMD" in
     "apu6" | "APU6" )
         build_pcengines "apu6"
         ;;
-    "optiplex_9010_uefi")
+    "optiplex_9010_uefi" | "optiplex_9010_sff_uefi")
         BOARD="optiplex_9010"
         build_optiplex_9010 "configs/config.dell_optiplex_9010_sff_uefi_txt"
         ;;
-    "optiplex_9010_seabios")
+    "optiplex_9010_seabios" | "optiplex_9010_sff")
         BOARD="optiplex_9010"
         build_optiplex_9010 "configs/config.dell_optiplex_9010_sff_txt"
         ;;
-    "qemu" | "QEMU" | "q35" | "Q35" )
+    "qemu" | "QEMU" | "q35" | "Q35" | "x86_q35_uefi" )
         build_qemu
         ;;
-    "qemu_full" | "QEMU_full" | "q35_full" | "Q35_full" )
+    "qemu_full" | "QEMU_full" | "q35_full" | "Q35_full" | "x86_q35_uefi_all_menus" )
         build_qemu "_all_menus"
         ;;
     "odroid_h4" | "odroid_H4" | "ODROID_H4" )