diff --git a/.github/workflows/bootloader.yaml b/.github/workflows/bootloader.yaml
index c45a7ff4f..efd619e95 100644
--- a/.github/workflows/bootloader.yaml
+++ b/.github/workflows/bootloader.yaml
@@ -36,8 +36,50 @@ env:
   DEFAULT_DIRECTORY: ot3-firmware
   TARGET: bootloader
 
+defaults:
+  run:
+    shell: bash
+    working-directory: ot3-firmware
 
 jobs:
-  run-non-executable-workflow:
-    uses: ./.github/workflows/non-executable-workflow.yaml
-    secrets: inherit
+  cross-compile-check:
+    name: "Cross-Compile/Check"
+    runs-on: "ubuntu-20.04"
+    timeout-minutes: 10
+    steps:
+      - name: Checkout github actions directory
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            .github/actions
+          sparse-checkout-cone-mode: false
+          path: actions
+
+      - name: Setup main
+        uses: ./actions/.github/actions/main-setup
+        with:
+          cache-version: ${{ secrets.CACHE_VERSION }}
+
+      - name: Cross-Compile/Check
+        uses: ./actions/.github/actions/cross-compile-check
+
+  host-compile-test:
+    name: "Host-Compile/Test"
+    runs-on: "ubuntu-20.04"
+    timeout-minutes: 10
+    steps:
+      - name: Checkout github actions directory
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            .github/actions
+          sparse-checkout-cone-mode: false
+          path: actions
+
+      - name: Setup main
+        uses: ./actions/.github/actions/main-setup
+        with:
+          cache-version: ${{ secrets.CACHE_VERSION }}
+
+      - name: Host-Compile/Test
+        uses: ./actions/.github/actions/host-compile-test
\ No newline at end of file