diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 5827206..234299b 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -47,13 +47,13 @@ jobs:
           images: |
             ${{ github.repository }}
             ghcr.io/${{ github.repository }}
+
       - name: Build and push Docker image
         id: build-and-push
         uses: docker/build-push-action@v4.0.0
         with:
           context: .
-          #platforms: linux/amd64,linux/arm64
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
index 4f73f61..1bbd197 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,6 @@
 FROM docker.io/library/fedora:37 as build
 
 ARG TAG=v23.01
-# Pick an arch that has at least sse 4.2 but does not require newer avx
-# See https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
-ARG ARCH=x86-64-v2
 
 RUN dnf install -y git rpm-build diffutils procps-ng pip python3-grpcio python3-grpcio-tools && dnf clean all
 
@@ -16,7 +13,10 @@ WORKDIR /root/spdk
 RUN git submodule update --init --depth 1 && \
     ./scripts/pkgdep.sh --rdma
 
-RUN DEPS="no" LDFLAGS=" " \
+# Pick an arch that has at least sse 4.2 but does not require newer avx
+# See https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
+RUN if [ "$(uname -m)" = "x86_64" ]; then export ARCH="x86-64-v2"; else export ARCH="native"; fi && \
+    DEPS="no" LDFLAGS=" " \
     ./rpmbuild/rpm.sh --target-arch=${ARCH} --without-uring --with-crypto \
     --without-fio --with-raid5f --with-vhost --without-pmdk --without-rbd \
     --with-rdma --without-shared --with-iscsi-initiator --without-vtune --with-vfio-user