diff --git a/.github/workflows/build-sp.yml b/.github/workflows/build-sp.yml
index 9f4b96ec90..69ba0a32d5 100644
--- a/.github/workflows/build-sp.yml
+++ b/.github/workflows/build-sp.yml
@@ -12,35 +12,8 @@ on:
         type: string 
 
 jobs:
-  build-rot:
-    if: ${{ inputs.system == 'rot' || inputs.system == 'all' }}
-    name: build-rot
-    strategy:
-      matrix:
-        build: [oxide-rot-1, oxide-rot-1-dev]
-        include:
-          - build: oxide-rot-1
-            app_name: oxide-rot-1
-            app_toml: app/oxide-rot-1/app.toml
-            target: thumbv8m.main-none-eabihf
-            image: "a, b"
-          - build: oxide-rot-1-dev
-            app_name: oxide-rot-1-dev
-            app_toml: app/oxide-rot-1/app-dev.toml
-            target: thumbv8m.main-none-eabihf
-            image: "a, b"
-    uses: ./.github/workflows/build-one.yml
-    with:
-      build: ${{ matrix.build }}
-      app_name: ${{ matrix.app_name }}
-      app_toml: ${{ matrix.app_toml }}
-      target: ${{ matrix.target }}
-      image: ${{ matrix.image }}
-      os: ${{ inputs.os }}
- 
-
   build-gimlet:
-    if: ${{ inputs.system == 'gimlet' || inputs.system == 'all' }}
+    if: ${{ inputs.board-set == 'gimlet' || inputs.board-set == 'all' }}
     name: build-gimlet
     strategy:
       matrix:
@@ -99,4 +72,70 @@ jobs:
       target: ${{ matrix.target }}
       image: ${{ matrix.image }}
       os: ${{ inputs.os }}
+
+   build-devboards:
+    if: ${{ inputs.board-set == 'devboards' || inputs.board-set == 'all' }}
+    name: build-devboards
+    strategy:
+      matrix:
+        build: [stm32f3, stm32f4, lpc55, stm32h743, stm32h753, gemini, rot-carrier, gimletlet, donglet-g031]
+        include:
+          - build: stm32g0
+            app_name: demo-stm32g070-nucleo
+            app_toml: app/demo-stm32g0-nucleo/app-g070.toml
+            target: thumbv6m-none-eabi
+            image: default
+          - build: stm32f3
+            app_name: demo-stm32f3-discovery
+            app_toml: app/demo-stm32f4-discovery/app-f3.toml
+            target: thumbv7em-none-eabihf
+            image: default
+          - build: stm32f4
+            app_name: demo-stm32f4-discovery
+            app_toml: app/demo-stm32f4-discovery/app.toml
+            target: thumbv7em-none-eabihf
+            image: default
+          - build: lpc55
+            app_name: lpc55xpresso
+            app_toml: app/lpc55xpresso/app.toml
+            target: thumbv8m.main-none-eabihf
+            image: "a, b"
+          - build: stm32h743
+            app_name: demo-stm32h743-nucleo
+            app_toml: app/demo-stm32h7-nucleo/app-h743.toml
+            target: thumbv7em-none-eabihf
+            image: default
+          - build: stm32h753
+            app_name: demo-stm32h753-nucleo
+            app_toml: app/demo-stm32h7-nucleo/app-h753.toml
+            target: thumbv7em-none-eabihf
+            image: default
+          - build: gemini
+            app_name: gemini-bu
+            app_toml: app/gemini-bu/app.toml
+            target: thumbv7em-none-eabihf
+            image: default
+          - build: rot-carrier
+            app_name: rot-carrier
+            app_toml: app/rot-carrier/app.toml
+            target: thumbv8m.main-none-eabihf
+            image: "a, b"
+          - build: gimletlet
+            app_name: gimletlet
+            app_toml: app/gimletlet/app.toml
+            target: thumbv7em-none-eabihf
+            image: default
+          - build: donglet-g031
+            app_name: donglet-g031
+            app_toml: app/donglet/app-g031.toml
+            target: thumbv6m-none-eabi
+            image: default
+    uses: ./.github/workflows/build-one.yml
+    with:
+      build: ${{ matrix.build }}
+      app_name: ${{ matrix.app_name }}
+      app_toml: ${{ matrix.app_toml }}
+      target: ${{ matrix.target }}
+      image: ${{ matrix.image }}
+      os: ${{ inputs.os }}