diff --git a/.gitea/workflows/gentoo-utils.yml b/.gitea/workflows/gentoo-utils.yml
index 07c4568..52d9e80 100644
--- a/.gitea/workflows/gentoo-utils.yml
+++ b/.gitea/workflows/gentoo-utils.yml
@@ -13,7 +13,9 @@ env:
 
 jobs:
   build-oci-image:
-    runs-on: ubuntu-latest
+    runs-on: zergling-dev
+    container:
+      image: docker.gitea.com/runner-images:ubuntu-latest
     continue-on-error: true
     steps:
       - name: Restore git cache
@@ -67,7 +69,8 @@ jobs:
         if: steps.image-changes.outputs.build_image == 'true'
         uses: docker/setup-buildx-action@v3
         with:
-          driver-opts: network=runners-net
+          install: false
+          driver: podman
 
       - name: Log in to Github Container Registry
         if: steps.image-changes.outputs.build_image == 'true'
@@ -86,11 +89,12 @@ jobs:
           context: "{{defaultContext}}:.docker"
           cache-from: type=gha
           cache-to: type=gha,mode=max
+          builder: buildah
     outputs:
       image_tag: ${{ steps.image-changes.outputs.image_tag }}
 
   build:
-    runs-on: brutalisk
+    runs-on: zergling-dev
     env:
       CC: 'clang'
       CXX: 'clang++'
@@ -109,7 +113,7 @@ jobs:
   # FIXME: Currently this rebuilds everything. Instead we should bring over the build dir from the build job. This will come in handy
   # when we have multiple build targets and configs. What we have currently is fine until we get lots of builds going
   test:
-    runs-on: brutalisk
+    runs-on: zergling-dev
     env:
       CC: 'clang'
       CXX: 'clang++'
@@ -127,7 +131,7 @@ jobs:
           ninja test -C build
 
   fuzz:
-    runs-on: brutalisk
+    runs-on: zergling-dev
     env:
       CC: 'clang'
       CXX: 'clang++'
@@ -159,7 +163,7 @@ jobs:
         continue-on-error: true
 
   check-format:
-    runs-on: brutalisk
+    runs-on: zergling-dev
     needs: [build-oci-image]
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
@@ -174,7 +178,7 @@ jobs:
           ninja rustfmt -C build
 
   docs:
-    runs-on: brutalisk
+    runs-on: zergling-dev
     needs: [build-oci-image]
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
@@ -188,7 +192,7 @@ jobs:
           ninja rustdoc -C docs
 
   grep:
-    runs-on: brutalisk
+    runs-on: zergling-dev
     needs: [build-oci-image]
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}