diff --git a/.github/workflows/build-arm64.yaml b/.github/workflows/build-arm64.yaml
index 31e7f79..324d0b6 100644
--- a/.github/workflows/build-arm64.yaml
+++ b/.github/workflows/build-arm64.yaml
@@ -9,9 +9,9 @@ on:
 jobs:
 
   build:
-    runs-on: [self-hosted, linux, ARM64]
+    runs-on: ubuntu-latest
     env:
-      ARCH: arm64
+      ARCH: amd64
     steps:
     - uses: actions/checkout@v3
     - run: |
@@ -47,6 +47,8 @@ jobs:
         pushFinalImages: true
         pushCache: true
         values: values/arm64.yaml
+        buildx: true
+        platform: linux/arm64
     - name: Create repo 🔧
       uses: luet-lab/luet-github-action@master
       if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index c20794b..65cf567 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -7,9 +7,9 @@ on:
   pull_request:
 jobs:
   build-arm64:
-    runs-on: [self-hosted, linux, ARM64]
+    runs-on: ubuntu-latest
     env:
-      ARCH: arm64
+      ARCH: amd64
     steps:
     - uses: actions/checkout@v3
     - run: |
@@ -42,6 +42,8 @@ jobs:
         pushFinalImages: false
         pushCache: false
         values: values/arm64.yaml
+        buildx: true
+        platform: linux/arm64
 
   build:
     runs-on: ubuntu-latest
@@ -57,7 +59,7 @@ jobs:
       with:
         FINAL_REPO: quay.io/kairos/packages
         REPOSITORY_TYPE: docker
-        downloadAllMeta: true
+        downloadAllMeta: false
         downloadFromList: true
         downloadMeta: true
     - name: Build packages 🔧