diff --git a/.github/workflows/actions-deploy.yml b/.github/workflows/actions-deploy.yml
index 5d0c3f5db..00a6d987f 100644
--- a/.github/workflows/actions-deploy.yml
+++ b/.github/workflows/actions-deploy.yml
@@ -1,9 +1,10 @@
 name: CD
 
 on:
-  push:
-    branches:
-      - master
+  pull_request:
+#  push:
+#    branches:
+#      - master
 
 permissions:
   contents: write
@@ -121,8 +122,12 @@ jobs:
           name: native-image-source
           path: ./build/artifacts/native-image-source/
 
-      - name: Configure Qemu
-        run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+      - name: Latest Qemu binaries (8.2x)
+        run: |
+          docker-compose -f docker-compose-qemu.yaml build --progress=plain
+
+      - name: Configure Qemu With Docker
+        run: docker run --rm --privileged defreitas/qemu-user-static --reset -p yes
 
       - name: Linux Arm Release
         run: |
diff --git a/Dockerfile.builder.linux-aarch64 b/Dockerfile.builder.linux-aarch64
index ec493f39e..c39d93f80 100644
--- a/Dockerfile.builder.linux-aarch64
+++ b/Dockerfile.builder.linux-aarch64
@@ -1,4 +1,4 @@
-FROM arm64v8/debian:11-slim
+FROM arm64v8/debian:12
 
 RUN apt-get update -y &&\
   apt-get install --force-yes -y build-essential curl &&\
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index da0d1e11a..14b808688 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,3 +1,6 @@
+## 3.22.0 
+* #473: Qemu upgrade
+
 ## 3.21.3
 * #496: Fixing aarch binary not building 
 
diff --git a/docker-compose-qemu.yaml b/docker-compose-qemu.yaml
new file mode 100644
index 000000000..b2cebfc7a
--- /dev/null
+++ b/docker-compose-qemu.yaml
@@ -0,0 +1,6 @@
+version: '3'
+services:
+  qemu_8:
+    image: defreitas/qemu-user-static:latest
+    build:
+      context: src/main/docker/qemu
diff --git a/gradle.properties b/gradle.properties
index 2f0206bcb..9e6bfaeda 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=3.21.3-snapshot
+version=3.22.0-snapshot
diff --git a/src/main/docker/qemu/Dockerfile b/src/main/docker/qemu/Dockerfile
new file mode 100644
index 000000000..82551fa2f
--- /dev/null
+++ b/src/main/docker/qemu/Dockerfile
@@ -0,0 +1,9 @@
+FROM multiarch/qemu-user-static:latest@sha256:fe60359c92e86a43cc87b3d906006245f77bfc0565676b80004cc666e4feb9f0
+
+RUN wget "http://ftp.de.debian.org/debian/pool/main/q/qemu/qemu-user-static_8.2.5+ds-1_amd64.deb"
+RUN mkdir releases &&\
+    dpkg-deb -X qemu-user-static_*.deb releases &&\
+    echo "copying " &&\
+    tree releases/usr/bin &&\
+    cp -f releases/usr/bin/* /usr/bin/
+