diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile
index f175acdb58..57aaf8a9db 100644
--- a/hosting/single/Dockerfile
+++ b/hosting/single/Dockerfile
@@ -41,7 +41,6 @@ ENV DEPLOYMENT_ENVIRONMENT=docker \
   SELF_HOSTED=1 \
   CLUSTER_PORT=10000 \
   REDIS_PASSWORD=budibase \
-  ARCHITECTURE=amd \
   APP_PORT=4001 \
   WORKER_PORT=4002
 
@@ -89,7 +88,7 @@ ADD hosting/single/vm.args ./etc/
 
 # setup minio
 WORKDIR /minio
-RUN wget https://dl.min.io/server/minio/release/linux-${ARCHITECTURE}64/minio && chmod +x minio
+RUN wget https://dl.min.io/server/minio/release/linux-${TARGETARCH}/minio && chmod +x minio
 
 # setup runner file
 WORKDIR /
diff --git a/package.json b/package.json
index 014cafcfc1..9c35af497f 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
     "build:docker:develop": "node scripts/pinVersions && lerna run build:docker && npm run build:docker:proxy:compose && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -",
     "build:docker:airgap": "node hosting/scripts/airgapped/airgappedDockerBuild",
     "build:digitalocean": "cd hosting/digitalocean && ./build.sh && cd -",
+    "build:docker:single:multiarch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/single/Dockerfile -t budibase:latest .",
     "build:docker:single:image": "docker build -f hosting/single/Dockerfile -t budibase:latest .",
     "build:docker:single": "lerna run build && lerna run predocker && npm run build:docker:single:image",
     "build:docs": "lerna run build:docs",
diff --git a/scripts/buildx-multiarch.sh b/scripts/buildx-multiarch.sh
new file mode 100755
index 0000000000..07a8fdb5c1
--- /dev/null
+++ b/scripts/buildx-multiarch.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+sudo apt-get install -y qemu qemu-user-static
+docker buildx create --name budibase
+docker buildx use budibase