diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4b0084b38a..d20d182db2 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -152,7 +152,7 @@ jobs:
         needs.check-changes.outputs.tests == 'true'))
         }}
       cmd: "pytest && pytest -m ros" # run tests that depend on ros as well
-      dev-image: ros-dev:${{ needs.ros-dev.result == 'success' && needs.check-changes.outputs.branch-tag || 'dev' }}
+      dev-image: ros-dev:${{ needs.check-changes.outputs.dev == 'true' && needs.ros-dev.result == 'success' && needs.check-changes.outputs.branch-tag || 'dev' }}
 
   run-tests:
     needs: [check-changes, dev]
@@ -166,7 +166,7 @@ jobs:
         needs.check-changes.outputs.tests == 'true'))
         }}
       cmd: "pytest"
-      dev-image: dev:${{ needs.dev.result == 'success' && needs.check-changes.outputs.branch-tag || 'dev' }}
+      dev-image: dev:${{ needs.check-changes.outputs.dev == 'true' && needs.dev.result == 'success' && needs.check-changes.outputs.branch-tag || 'dev' }}
 
   # we run in parallel with normal tests for speed
   run-heavy-tests:
@@ -181,7 +181,7 @@ jobs:
         needs.check-changes.outputs.tests == 'true'))
         }}
       cmd: "pytest -m heavy"
-      dev-image: dev:${{ needs.dev.result == 'success' && needs.check-changes.outputs.branch-tag || 'dev' }}
+      dev-image: dev:${{ needs.check-changes.outputs.dev == 'true' && needs.dev.result == 'success' && needs.check-changes.outputs.branch-tag || 'dev' }}
 
   run-lcm-tests:
     needs: [check-changes, dev]
@@ -195,47 +195,46 @@ jobs:
         needs.check-changes.outputs.tests == 'true'))
         }}
       cmd: "pytest -m lcm"
-      dev-image: dev:${{ needs.dev.result == 'success' && needs.check-changes.outputs.branch-tag || 'dev' }}
+      dev-image: dev:${{ needs.check-changes.outputs.dev == 'true' && needs.dev.result == 'success' && needs.check-changes.outputs.branch-tag || 'dev' }}
 
   # Run module tests directly to avoid pytest forking issues
-  run-module-tests:
-    needs: [check-changes, dev]
-    if: ${{
-      always() &&
-      needs.check-changes.result == 'success' &&
-      ((needs.dev.result == 'success') ||
-      (needs.dev.result == 'skipped' &&
-      needs.check-changes.outputs.tests == 'true'))
-      }}
-    runs-on: [self-hosted, x64, 16gb]
-    container:
-      image: ghcr.io/dimensionalos/dev:${{ needs.dev.result == 'success' && needs.check-changes.outputs.branch-tag || 'dev' }}
-    steps:
-      - name: Fix permissions
-        run: |
-          sudo chown -R $USER:$USER ${{ github.workspace }} || true
-          
-      - uses: actions/checkout@v4
-        with:
-          lfs: true
-          
-      - name: Configure Git LFS
-        run: |
-          git config --global --add safe.directory '*'
-          git lfs install
-          git lfs fetch
-          git lfs checkout
-        
-      - name: Run module tests
-        env:
-          CI: "true"
-        run: |
-          /entrypoint.sh bash -c "pytest -m module"
+  # run-module-tests:
+  #   needs: [check-changes, dev]
+  #   if: ${{
+  #     always() &&
+  #     needs.check-changes.result == 'success' &&
+  #     ((needs.dev.result == 'success') ||
+  #     (needs.dev.result == 'skipped' &&
+  #     needs.check-changes.outputs.tests == 'true'))
+  #     }}
+  #   runs-on: [self-hosted, x64, 16gb]
+  #   container:
+  #     image: ghcr.io/dimensionalos/dev:${{ needs.check-changes.outputs.dev == 'true' && needs.dev.result == 'success' && needs.check-changes.outputs.branch-tag || 'dev' }}
+  #   steps:
+  #     - name: Fix permissions
+  #       run: |
+  #         sudo chown -R $USER:$USER ${{ github.workspace }} || true
+  #         
+  #     - uses: actions/checkout@v4
+  #       with:
+  #         lfs: true
+  #         
+  #     - name: Configure Git LFS
+  #       run: |
+  #         git config --global --add safe.directory '*'
+  #         git lfs install
+  #         git lfs fetch
+  #         git lfs checkout
+  #       
+  #     - name: Run module tests
+  #       env:
+  #         CI: "true"
+  #       run: |
+  #         /entrypoint.sh bash -c "pytest -m module"
       
   # TODO: Remove when merge to main as workflow_run needed
   cleanup-runner:
-    needs: [run-tests, run-heavy-tests, run-ros-tests, run-lcm-tests, run-module-tests]
-    if: always()
+    needs: [run-tests, run-heavy-tests, run-ros-tests, run-lcm-tests] 
     runs-on: [self-hosted, Linux]
     steps:
       - name: Check disk usage