diff --git a/.github/generate-strategy.sh b/.github/generate-strategy.sh
index 0df26798..81521b82 100755
--- a/.github/generate-strategy.sh
+++ b/.github/generate-strategy.sh
@@ -60,7 +60,7 @@ for version in "${debian_versions[@]}"; do
 		postgresImageVersion="${postgresImageVersion%[.-]*}"
 	done
     # Support platform for container images
-	platforms="linux/amd64"
+	platforms="linux/amd64,linux/arm64"
 
 	# Build the json entry
 	entries+=(
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 089ab351..9f089b6d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,6 +39,9 @@ jobs:
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2.0.0
+      with:
+        image: tonistiigi/binfmt:qemu-v6.1.0
+        platforms: ${{ matrix.platforms }}
 
     - name: Docker meta
       id: docker-meta