diff --git a/.github/workflows/build_esp32.yml b/.github/workflows/build_esp32.yml
index b3ce24ed8..7b618604b 100644
--- a/.github/workflows/build_esp32.yml
+++ b/.github/workflows/build_esp32.yml
@@ -11,6 +11,13 @@ jobs:
   build-esp32:
     runs-on: ubuntu-latest
       steps:
+        - name: Checkout code
+          uses: actions/checkout@v3
+          with:
+            submodules: "recursive"
+            ref: ${{github.event.pull_request.head.ref}}
+            repository: ${{github.event.pull_request.head.repo.full_name}}
+
         - name: Setup Python
           uses: actions/setup-python@v4
           with:
diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index af2518941..962a8892d 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -96,20 +96,9 @@ jobs:
           - board: tbeam-s3-core
 
     runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-            
-      - name: Show contents # For diagnostics
-        run: ls -lR
-
-      - uses: ./../.github/workflows/build_esp32.yml
-        with:
-          board: ${{ matrix.board }}
+    uses: ./.github/workflows/build_esp32.yml
+      with:
+        board: ${{ matrix.board }}
 
   build-nrf52:
     strategy: