diff --git a/.github/workflows/build-builder.yml b/.github/workflows/build-builder.yml
index 7de256f7..3cbae859 100644
--- a/.github/workflows/build-builder.yml
+++ b/.github/workflows/build-builder.yml
@@ -11,17 +11,9 @@ on:
 jobs:
   build:
     name: Build base docker image
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      -
-        # Add support for more platforms with QEMU (optional)
-        # https://github.com/docker/setup-qemu-action
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
diff --git a/.github/workflows/build-system-image.yml b/.github/workflows/build-system-image.yml
index 81c80fc6..8a7952f6 100644
--- a/.github/workflows/build-system-image.yml
+++ b/.github/workflows/build-system-image.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   build-system-image:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     permissions:
       contents: write
     outputs:
@@ -22,32 +22,32 @@ jobs:
       display_version: ${{ steps.build_image.outputs.display_version }}
       image_filename: ${{ steps.build_image.outputs.image_filename }}
     steps:
-      # - name: Free Disk Space (Ubuntu)
-      #   uses: jlumbroso/free-disk-space@main
-      #   with:
-      #     # this might remove tools that are actually needed,
-      #     # if set to "true" but frees about 6 GB
-      #     tool-cache: false
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
           
-      #     # all of these default to true, but feel free to set to
-      #     # "false" if necessary for your workflow
-      #     android: true
-      #     dotnet: true
-      #     haskell: true
-      #     large-packages: true
-      #     docker-images: true
-      #     swap-storage: true
-      - name: Maximize build space
-        run: |
-          df -h
-          sudo rm -rf /usr/share/dotnet || true
-          sudo rm -rf /usr/share/swift || true
-          sudo rm -rf /usr/share/java || true
-          sudo rm -rf /usr/local/lib/android || true
-          sudo rm -rf /opt/ghc || true
-          sudo rm -rf /opt/hostedtoolcache || true
-          sudo rm -rf /opt/az || true
-          df -h
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
+      # - name: Maximize build space
+      #   run: |
+      #     df -h
+      #     sudo rm -rf /usr/share/dotnet
+      #     sudo rm -rf /usr/share/swift
+      #     sudo rm -rf /usr/share/java
+      #     sudo rm -rf /usr/local/lib/android
+      #     sudo rm -rf /opt/ghc
+      #     sudo rm -rf /opt/hostedtoolcache
+      #     sudo rm -rf /opt/az
+      #     df -h
 
       - uses: actions/checkout@v4
       - name: Extract metadata (tags, labels) for Docker
diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml
index 7570e708..4462be0f 100644
--- a/.github/workflows/stable.yml
+++ b/.github/workflows/stable.yml
@@ -17,7 +17,7 @@ jobs:
 
   list-pkgbuilds:
     name: List Packages
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     outputs:
       aur-pkgs: ${{ steps.set-aur-pkgs.outputs.matrix }}
       pkgs: ${{ steps.set-pkgs.outputs.matrix }}
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      # - run: git submodule update --recursive --remote aur-pkgs 
+      - run: git submodule update --recursive --remote aur-pkgs 
       - id: set-aur-pkgs
         run: echo "matrix=$(ls -d aur-pkgs/*/ | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
         shell: bash
@@ -38,7 +38,7 @@ jobs:
      - build-docker-image
      - list-pkgbuilds
     name: Build AUR package
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
@@ -86,7 +86,7 @@ jobs:
      - build-docker-image
      - list-pkgbuilds
     name: Build package
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix: