diff --git a/Dockerfile b/Dockerfile
index f761a5b..9f99a82 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 # syntax=docker/dockerfile:1
 
-FROM alpine:3.17 as rootfs-stage
+FROM alpine:3.19 AS rootfs-stage
 
 # environment
 ENV REL=jammy
-ENV ARCH=amd64
+ARG ARCH=amd64
 
 # install packages
 RUN \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index dda5328..26d57ae 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -4,7 +4,7 @@ FROM alpine:3.17 as rootfs-stage
 
 # environment
 ENV REL=jammy
-ENV ARCH=arm64
+ARG ARCH=arm64
 
 # install packages
 RUN \
@@ -53,6 +53,8 @@ ARG LSIOWN_VERSION="v1"
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="TheLamer"
 
+ARG QEMU_ARCH=aarch64
+
 ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods"
 ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run"
 ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown"
@@ -132,9 +134,9 @@ RUN \
     /lsiopy && \
   echo "**** add qemu ****" && \
   curl -o \
-  /usr/bin/qemu-aarch64-static -L \
-    "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static" && \
-  chmod +x /usr/bin/qemu-aarch64-static && \
+  /usr/bin/qemu-${QEMU_ARCH}-static -L \
+    "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-${QEMU_ARCH}-static" && \
+  chmod +x /usr/bin/qemu-${QEMU_ARCH}-static && \
   echo "**** cleanup ****" && \
   apt-get autoremove && \
   apt-get clean && \