diff --git a/.github/workflows/custom_build.yml b/.github/workflows/custom_build.yml
index c84fbe3..9ea4505 100644
--- a/.github/workflows/custom_build.yml
+++ b/.github/workflows/custom_build.yml
@@ -54,6 +54,17 @@ jobs:
           EOF
           chmod +x /tmp/update_status.sh
 
+      - name: Update Status - Setting Up Python
+        shell: bash
+        run: |
+          source /tmp/update_status.sh
+          update_status setting_up_python
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
       - name: Update Status - Fetching Mesh Forge
         shell: bash
         run: |
@@ -111,11 +122,15 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: MeshEnvy/mpm
-          ref: ${{ inputs.version }}
           path: mpm
-          submodules: recursive
           fetch-depth: 1
 
+      - name: Update Status - Fetching Mesh Package Manager
+        shell: bash
+        run: |
+          source /tmp/update_status.sh
+          update_status checking_out_mpm
+
       - name: Install Python Requirements
         working-directory: firmware
         run: |
@@ -137,17 +152,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pio-
 
-      - name: Update Status - Setting Up Python
-        shell: bash
-        run: |
-          source /tmp/update_status.sh
-          update_status setting_up_python
-
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-
       - name: Update Status - Installing PlatformIO
         shell: bash
         run: |