diff --git a/.github/workflows/ci-qemu.yml b/.github/workflows/ci-qemu.yml
index 354ea21..0dec3d3 100644
--- a/.github/workflows/ci-qemu.yml
+++ b/.github/workflows/ci-qemu.yml
@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   docker:
-    runs-on: [self-hosted, qemu]
+    runs-on: ebpro-org
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1fed111..29d2189 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   docker:
-    runs-on: [self-hosted, multiarch]
+    runs-on: ebpro-org
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -98,7 +98,7 @@ jobs:
           repository: "${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPOSITORY_NAME }}"          
 
 create-manifests:
-    runs-on: [self-hosted]
+    runs-on: ebpro-org
     needs: [build-push-x64, build-push-arm64]
 
     steps: