diff --git a/.github/workflows/publish-docker-and-wsl.yaml b/.github/workflows/publish-docker-and-wsl.yaml
index 07e9612b..eb99eea1 100644
--- a/.github/workflows/publish-docker-and-wsl.yaml
+++ b/.github/workflows/publish-docker-and-wsl.yaml
@@ -39,7 +39,7 @@ jobs:
       uses: docker/build-push-action@v2
       with:
         file: ./portable.Dockerfile
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm64
         push: true
         tags: |
           ${{ steps.docker_meta.outputs.tags }}
diff --git a/docker/g++ b/docker/g++
index 7a4a0a4a..0b696167 100755
--- a/docker/g++
+++ b/docker/g++
@@ -9,4 +9,9 @@ do
     fi
 done
 
-/usr/bin/g++_real -march=nehalem "${args[@]}"
+ARCH=nehalem
+if [[ $(uname -m) == "aarch64" ]];
+    ARCH=armv8-a
+fi
+
+/usr/bin/g++_real -march=$ARCH "${args[@]}"
diff --git a/docker/gcc b/docker/gcc
index 70fb53d5..cd45e704 100755
--- a/docker/gcc
+++ b/docker/gcc
@@ -9,4 +9,9 @@ do
     fi
 done
 
-/usr/bin/gcc_real -march=nehalem "${args[@]}"
+ARCH=nehalem
+if [[ $(uname -m) == "aarch64" ]];
+    ARCH=armv8-a
+fi
+
+/usr/bin/gcc_real -march=$ARCH "${args[@]}"