diff --git a/.github/workflows/main-workflow-template.yml b/.github/workflows/main-workflow-template.yml
index f3cf337..e337b24 100644
--- a/.github/workflows/main-workflow-template.yml
+++ b/.github/workflows/main-workflow-template.yml
@@ -47,17 +47,17 @@ on:
 
 jobs:
   matrix_prep:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
     - name: Check out code 
       uses: actions/checkout@v4
 
-    # - name: Set up Python
-    #   uses: actions/setup-python@v5 
-    #   with:
-    #     python-version: '3.13.2'
+    - name: Set up Python
+      uses: actions/setup-python@v5 
+      with:
+        python-version: '3.13.2'
 
     - id: set-matrix
       run: |
@@ -70,7 +70,7 @@ jobs:
         echo "matrix={\"include\":$(echo $matrix)}" >> $GITHUB_OUTPUT
 
   docker:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     needs: matrix_prep
     strategy:
       fail-fast: false
@@ -85,8 +85,8 @@ jobs:
         if: ${{ inputs.context == 'base' }}
         run: cp -r scripts/ base/scripts/
 
-      # - name: Make free space
-      #   uses: ./.github/actions/make-free-space
+      - name: Make free space
+        uses: ./.github/actions/make-free-space
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -124,8 +124,8 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      # - name: Restore common Docker images from cache
-      #   uses: ./.github/actions/cache-common-images
+      - name: Restore common Docker images from cache
+        uses: ./.github/actions/cache-common-images
       
       - name: Push to DockerHub
         if: ${{ github.ref == 'refs/heads/main' }}