diff --git a/.github/workflows/development-build.yml b/.github/workflows/development-build.yml
index 51415444f..1fa47a930 100644
--- a/.github/workflows/development-build.yml
+++ b/.github/workflows/development-build.yml
@@ -52,7 +52,7 @@ jobs:
             push: true
             tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next-aarch64
   merge-manifest:
-      runs-on: [self-hosted, x64]
+      runs-on: ubuntu-latest
       permissions:
         contents: read
         packages: write
diff --git a/.github/workflows/production-build.yml b/.github/workflows/production-build.yml
index 559145269..f6219767b 100644
--- a/.github/workflows/production-build.yml
+++ b/.github/workflows/production-build.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   amd64:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, x64]
     steps:
       - uses: actions/checkout@v3
       - name: Login to ghcr.io