diff --git a/.gitea/workflows/ci-build.yml b/.gitea/workflows/ci-build.yml
index 69a45b7b5..20e0068e4 100644
--- a/.gitea/workflows/ci-build.yml
+++ b/.gitea/workflows/ci-build.yml
@@ -24,7 +24,7 @@ concurrency:
 jobs:
   build-staging:
     name: Build Staging ${{ matrix.service_display }} Image
-    runs-on: ci-l2
+    runs-on: runtime-builder
     timeout-minutes: ${{ matrix.timeout }}
     if: github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'develop')
     strategy:
@@ -142,7 +142,7 @@ jobs:
         '
   deploy-staging:
     name: Deploy Staging (Watchtower auto-deploy)
-    runs-on: ci-l3
+    runs-on: runtime-builder
     timeout-minutes: 15
     concurrency:
       group: deploy-staging-${{ gitea.ref }}
@@ -296,7 +296,7 @@ jobs:
         '
   staging-e2e:
     name: Staging E2E Tests
-    runs-on: ci-l3
+    runs-on: runtime-builder
     timeout-minutes: 15
     if: github.ref_name == 'develop' || github.ref_name == 'main'
     needs: deploy-staging
@@ -376,7 +376,7 @@ jobs:
         '
   staging-api-tests:
     name: Staging API Integration Tests
-    runs-on: ci-l2
+    runs-on: runtime-builder
     timeout-minutes: 10
     if: github.ref_name == 'develop' || github.ref_name == 'main'
     needs: deploy-staging
@@ -456,7 +456,7 @@ jobs:
         '
   build-production:
     name: Build Production ${{ matrix.service_display }} Image
-    runs-on: ci-l2
+    runs-on: runtime-builder
     timeout-minutes: ${{ matrix.timeout }}
     needs:
     if: startsWith(github.ref, 'refs/tags/v')
@@ -576,7 +576,7 @@ jobs:
         '
   deploy-production:
     name: Deploy Production
-    runs-on: ci-l3
+    runs-on: runtime-builder
     timeout-minutes: 30
     concurrency:
       group: deploy-production-${{ gitea.ref }}
@@ -722,7 +722,7 @@ jobs:
         '
   production-e2e:
     name: Production Browser E2E
-    runs-on: ci-l3
+    runs-on: runtime-builder
     timeout-minutes: 15
     if: startsWith(github.ref, 'refs/tags/v')
     needs: deploy-production