diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 874b9171142a..a10eddd20514 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -16,7 +16,7 @@ env:
 
 jobs:
   build-and-push:
-    runs-on: k8s-infrastructure-dind 
+    runs-on: ubuntu-latest
 
     permissions:
       contents: read
@@ -63,7 +63,9 @@ jobs:
         with:
           context: .
           file: ./docker/Dockerfile
-          platforms: linux/amd64,linux/arm64
+          platforms: |
+            linux/amd64
+            linux/arm64/v8
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}