diff --git a/.github/workflows/build-arm64.yaml b/.github/workflows/build-arm64.yaml
index 15b7cb7..31e7f79 100644
--- a/.github/workflows/build-arm64.yaml
+++ b/.github/workflows/build-arm64.yaml
@@ -9,9 +9,9 @@ on:
 jobs:
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, linux, ARM64]
     env:
-      ARCH: amd64
+      ARCH: arm64
     steps:
     - uses: actions/checkout@v3
     - run: |
@@ -29,7 +29,7 @@ jobs:
       with:
         FINAL_REPO: quay.io/kairos/packages-arm64
         REPOSITORY_TYPE: docker
-        downloadAllMeta: false
+        downloadAllMeta: true
         downloadFromList: true
         downloadMeta: true
     - name: Build packages 🔧
@@ -39,8 +39,6 @@ jobs:
         build: true
         fromIndex: true
         onlyMissing: true
-        buildx: true
-        platform: linux/arm64
         FINAL_REPO: quay.io/kairos/packages-arm64
         DOCKER_USERNAME: ${{ secrets.QUAY_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 74b8c11..c20794b 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -7,9 +7,9 @@ on:
   pull_request:
 jobs:
   build-arm64:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, linux, ARM64]
     env:
-      ARCH: amd64
+      ARCH: arm64
     steps:
     - uses: actions/checkout@v3
     - run: |
@@ -35,8 +35,6 @@ jobs:
       with:
         build: true
         fromIndex: true
-        buildx: true
-        platform: linux/arm64
         onlyMissing: true
         FINAL_REPO: quay.io/kairos/packages
         DOCKER_USERNAME: ${{ secrets.QUAY_USERNAME }}
@@ -59,7 +57,7 @@ jobs:
       with:
         FINAL_REPO: quay.io/kairos/packages
         REPOSITORY_TYPE: docker
-        downloadAllMeta: false
+        downloadAllMeta: true
         downloadFromList: true
         downloadMeta: true
     - name: Build packages 🔧