diff --git a/.github/workflows/executable-workflow.yaml b/.github/workflows/executable-workflow.yaml
index c3c4fda3c..95d39fa9b 100644
--- a/.github/workflows/executable-workflow.yaml
+++ b/.github/workflows/executable-workflow.yaml
@@ -88,7 +88,6 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: my-artifact
-#          path: ${{ github.workspace }}
 
       - name: Build Simulator
         uses: ./actions/.github/actions/build-simulator
diff --git a/.github/workflows/spi.yaml b/.github/workflows/spi.yaml
index 71a655713..01b42806c 100644
--- a/.github/workflows/spi.yaml
+++ b/.github/workflows/spi.yaml
@@ -1,38 +1,17 @@
-name: "spi build/test"
+name: "Non-Executable Flows"
 on:
   pull_request:
-    paths:
-      - "spi/**"
-      - "common/**"
-      - "include/spi/**"
-      - "cmake/*"
-      - "!cmake/Arduino*"
-      - "CMakeLists.txt"
-      - "CMakePresets.json"
-      - ".clang-format"
-      - ".clang-tidy"
   push:
-    paths:
-      - "spi/**"
-      - "common/**"
-      - "include/spi/**"
-      - "include/common/**"
-      - "cmake/*"
-      - "!cmake/Arduino*"
-      - "CMakeLists.txt"
-      - "CMakePresets.json"
-      - ".clang-format"
-      - ".clang-tidy"
-      - ".github/workflows/spi.yaml"
     branches:
       - "*"
-    tags:
-      - "spi@*"
   workflow_dispatch:
 
 jobs:
+  strategy:
+    matrix:
+      target: [can, common, eeprom, i2c, motor-control, sensors, spi]
   run-non-executable-workflow:
     uses: ./.github/workflows/non-executable-workflow.yaml
     with:
-      target: spi
+      target: ${{ matrix.target }}
     secrets: inherit
\ No newline at end of file