diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 598af2a..6f33f5d 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -97,7 +97,7 @@ jobs:
         fi
     
     - name: Build base image
-      uses: home-assistant/builder@2022.03.1
+      uses: home-assistant/builder@2022.06.1
       with:
         args: |
           $BUILD_ARGS \
@@ -145,7 +145,7 @@ jobs:
         fi
     
     - name: Build base image
-      uses: home-assistant/builder@2022.03.1
+      uses: home-assistant/builder@2022.06.1
       with:
         args: |
           $BUILD_ARGS \
@@ -194,7 +194,7 @@ jobs:
         fi
     
     - name: Build base image
-      uses: home-assistant/builder@2022.03.1
+      uses: home-assistant/builder@2022.06.1
       with:
         args: |
           $BUILD_ARGS \
@@ -242,7 +242,7 @@ jobs:
         fi
     
     - name: Build base image
-      uses: home-assistant/builder@2022.03.1
+      uses: home-assistant/builder@2022.06.1
       with:
         args: |
           $BUILD_ARGS \
@@ -292,7 +292,7 @@ jobs:
         fi
     
     - name: Build base image
-      uses: home-assistant/builder@2022.03.1
+      uses: home-assistant/builder@2022.06.1
       with:
         args: |
           $BUILD_ARGS \
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 080e9d9..02d795c 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -17,12 +17,13 @@ ENV \
 # Set shell
 SHELL ["/bin/ash", "-o", "pipefail", "-c"]
 
-# Version
+# Build Args
 ARG \
     BASHIO_VERSION \
     TEMPIO_VERSION \
     S6_OVERLAY_VERSION \
-    JEMALLOC_VERSION
+    JEMALLOC_VERSION \
+    QEMU_CPU
 
 # Base system
 WORKDIR /usr/src
diff --git a/debian/Dockerfile b/debian/Dockerfile
index 94a7108..ccd9abd 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -19,11 +19,12 @@ ENV \
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-# Version
+# Build Args
 ARG \
     BASHIO_VERSION \
     TEMPIO_VERSION \
-    S6_OVERLAY_VERSION
+    S6_OVERLAY_VERSION \
+    QEMU_CPU
 
 # Base system
 WORKDIR /usr/src
diff --git a/python/3.10/Dockerfile b/python/3.10/Dockerfile
index f657081..4d1f4be 100644
--- a/python/3.10/Dockerfile
+++ b/python/3.10/Dockerfile
@@ -4,7 +4,8 @@ FROM $BUILD_FROM
 ARG \
     PYTHON_VERSION \
     PIP_VERSION \
-    GPG_KEY
+    GPG_KEY \
+    QEMU_CPU
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/python/3.8/Dockerfile b/python/3.8/Dockerfile
index d709d48..2b1c870 100644
--- a/python/3.8/Dockerfile
+++ b/python/3.8/Dockerfile
@@ -4,7 +4,8 @@ FROM $BUILD_FROM
 ARG \
     PYTHON_VERSION \
     PIP_VERSION \
-    GPG_KEY
+    GPG_KEY \
+    QEMU_CPU
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/python/3.9/Dockerfile b/python/3.9/Dockerfile
index f657081..4d1f4be 100644
--- a/python/3.9/Dockerfile
+++ b/python/3.9/Dockerfile
@@ -4,7 +4,8 @@ FROM $BUILD_FROM
 ARG \
     PYTHON_VERSION \
     PIP_VERSION \
-    GPG_KEY
+    GPG_KEY \
+    QEMU_CPU
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/raspbian/Dockerfile b/raspbian/Dockerfile
index 9329102..db0e368 100644
--- a/raspbian/Dockerfile
+++ b/raspbian/Dockerfile
@@ -15,11 +15,12 @@ ENV \
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-# Version
+# Build Args
 ARG \
     BASHIO_VERSION \
     TEMPIO_VERSION \
-    S6_OVERLAY_VERSION
+    S6_OVERLAY_VERSION \
+    QEMU_CPU
 
 # Base system
 WORKDIR /usr/src