diff --git a/.github/workflows/bootloader.yaml b/.github/workflows/bootloader.yaml
index efd619e95..0ed6b697e 100644
--- a/.github/workflows/bootloader.yaml
+++ b/.github/workflows/bootloader.yaml
@@ -31,55 +31,9 @@ on:
       - "bootloader@*"
   workflow_dispatch:
 
-env:
-  ci: 1
-  DEFAULT_DIRECTORY: ot3-firmware
-  TARGET: bootloader
-
-defaults:
-  run:
-    shell: bash
-    working-directory: ot3-firmware
-
 jobs:
-  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
+  run-non-executable-workflow:
+    uses: ./.github/workflows/non-executable-workflow.yaml
+    with:
+      target: bootloader
+    secrets: inherit
diff --git a/.github/workflows/non-executable-workflow.yaml b/.github/workflows/non-executable-workflow.yaml
index 1fec46354..64f1afd0f 100644
--- a/.github/workflows/non-executable-workflow.yaml
+++ b/.github/workflows/non-executable-workflow.yaml
@@ -2,6 +2,15 @@ name: Workflow for Non-executable Targets
 
 on:
   workflow_call:
+    inputs:
+      target:
+        description: Non-executable target
+        required: true
+
+env:
+  ci: 1
+  DEFAULT_DIRECTORY: ot3-firmware
+  TARGET: ${{ inputs.target }}
 
 defaults:
   run: