diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile
index f0df9373c5..495f7ef246 100644
--- a/hosting/single/Dockerfile
+++ b/hosting/single/Dockerfile
@@ -20,6 +20,8 @@ RUN node /pinVersions.js && yarn && yarn build && /cleanup.sh
 
 FROM couchdb:3.2.1
 
+ARG TARGETARCH amd64
+
 COPY --from=build /app /app
 COPY --from=build /worker /worker
 
@@ -39,7 +41,6 @@ ENV DEPLOYMENT_ENVIRONMENT=docker \
   SELF_HOSTED=1 \
   CLUSTER_PORT=10000 \
   REDIS_PASSWORD=budibase \
-  ARCHITECTURE=amd \
   APP_PORT=4001 \
   WORKER_PORT=4002
 
@@ -66,7 +67,7 @@ RUN mkdir /etc/nginx/logs && \
 WORKDIR /
 RUN mkdir -p scripts/integrations/oracle
 ADD packages/server/scripts/integrations/oracle scripts/integrations/oracle
-RUN /bin/bash -e ./scripts/integrations/oracle/instantclient/linux/x86-64/install.sh
+RUN /bin/bash -e ./scripts/integrations/oracle/instantclient/linux/install.sh
 
 # setup clouseau
 WORKDIR /
@@ -87,7 +88,8 @@ 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
+ADD scripts/install-minio.sh ./install.sh
+RUN chmod +x install.sh && ./install.sh
 
 # 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/packages/server/scripts/integrations/oracle/instantclient/linux/arm64/basiclite-19.10.zip b/packages/server/scripts/integrations/oracle/instantclient/linux/arm64/basiclite-19.10.zip
new file mode 100644
index 0000000000..a6ab63b68e
Binary files /dev/null and b/packages/server/scripts/integrations/oracle/instantclient/linux/arm64/basiclite-19.10.zip differ
diff --git a/packages/server/scripts/integrations/oracle/instantclient/linux/arm64/install.sh b/packages/server/scripts/integrations/oracle/instantclient/linux/arm64/install.sh
new file mode 100755
index 0000000000..7b7402673d
--- /dev/null
+++ b/packages/server/scripts/integrations/oracle/instantclient/linux/arm64/install.sh
@@ -0,0 +1,23 @@
+#!/bin/bash 
+
+# Must be root to continue
+if [[ $(id -u) -ne 0 ]] ; then echo "Please run as root" ; exit 1 ; fi
+
+# Allow for re-runs
+rm -rf /opt/oracle
+
+echo "Installing oracle instant client"
+
+# copy and unzip package
+mkdir -p /opt/oracle
+cp scripts/integrations/oracle/instantclient/linux/arm64/basiclite-19.10.zip /opt/oracle
+cd /opt/oracle
+unzip -qq basiclite-19.10.zip -d .
+rm *.zip
+mv instantclient* instantclient
+
+# update runtime link path
+sh -c "echo /opt/oracle/instantclient > /etc/ld.so.conf.d/oracle-instantclient.conf"
+ldconfig /etc/ld.so.conf.d
+
+echo "Installation complete"
diff --git a/packages/server/scripts/integrations/oracle/instantclient/linux/install.sh b/packages/server/scripts/integrations/oracle/instantclient/linux/install.sh
new file mode 100755
index 0000000000..4662996a44
--- /dev/null
+++ b/packages/server/scripts/integrations/oracle/instantclient/linux/install.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && pwd 2> /dev/null; )"
+if [[ $TARGETARCH == arm* ]] ;
+then
+  echo "Installing ARM Oracle instant client..."
+  $SCRIPT_DIR/arm64/install.sh
+else
+  echo "Installing x86-64 Oracle instant client..."
+  $SCRIPT_DIR/x86-64/install.sh
+fi
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
diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh
index d0f557a876..94a3d7e2be 100644
--- a/scripts/cleanup.sh
+++ b/scripts/cleanup.sh
@@ -1,11 +1,16 @@
 #!/bin/bash
 dir=$(pwd)
-mv dist /
-mv package.json /
+declare -a keep=("dist" "package.json" "yarn.lock" "client" "builder" "build" "pm2.config.js" "docker_run.sh")
+for moveDir in "${keep[@]}"
+do
+  mv $moveDir / 2>/dev/null
+done
 cd /
 rm -r $dir
 mkdir $dir
-mv /dist $dir
-mv /package.json $dir
+for keepDir in "${keep[@]}"
+do
+  mv /$keepDir $dir/ 2>/dev/null
+done
 cd $dir
 NODE_ENV=production yarn
diff --git a/scripts/install-minio.sh b/scripts/install-minio.sh
new file mode 100755
index 0000000000..4f7e589e86
--- /dev/null
+++ b/scripts/install-minio.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+if [[ $TARGETARCH == arm* ]] ;
+then
+  wget https://dl.min.io/server/minio/release/linux-arm64/minio
+else
+  wget https://dl.min.io/server/minio/release/linux-amd64/minio
+fi
+chmod +x minio