diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
index 5acf963..3944e7f 100644
--- a/.github/workflows/docker-push.yml
+++ b/.github/workflows/docker-push.yml
@@ -51,10 +51,10 @@ jobs:
             latest=${{ contains(github.event.head_commit.message, '[release]') == true }}
           tags: |
             type=raw,value=${{ env.XPIPE_TAG }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: Setup buildx
         uses: docker/setup-buildx-action@v1
-        with:
-          platforms: linux/amd64,linux/arm64
       - name: Build and push Docker image
         id: push
         uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
diff --git a/Dockerfile b/Dockerfile
index 3a4745b..30158a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-ARG BASE_IMAGE_TAG
+ENV BASE_IMAGE_TAG=""
 FROM scratch AS base
 
 FROM base AS build-arm64
-ARG BASE_IMAGE_TAG=arm64v8-ubuntunoble
+ENV BASE_IMAGE_TAG="arm64v8-ubuntunoble"
 
 FROM base AS build-amd64
-ARG BASE_IMAGE_TAG=ubuntunoble
+ENV BASE_IMAGE_TAG="ubuntunoble"
 
 FROM ghcr.io/linuxserver/baseimage-kasmvnc:${BASE_IMAGE_TAG}