diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile
index a3aff3d4..485ad261 100644
--- a/core/admin/Dockerfile
+++ b/core/admin/Dockerfile
@@ -1,4 +1,5 @@
 # First stage to build assets
+ARG DISTRO=alpine:3.10
 ARG ARCH=""
 FROM ${ARCH}node:8 as assets
 COPY --from=balenalib/rpi-alpine:3.10 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
@@ -13,7 +14,6 @@ RUN mkdir static \
 
 
 # Actual application
-ARG DISTRO=alpine:3.10
 FROM $DISTRO
 # python3 shared with most images
 RUN apk add --no-cache \
diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile
index 9a526617..3e888215 100644
--- a/webmails/roundcube/Dockerfile
+++ b/webmails/roundcube/Dockerfile
@@ -1,4 +1,6 @@
 # NOTE: only add file if building for arm
+ARG ARCH=""
+ARG QEMU=other
 FROM ${ARCH}php:7.3-apache as build_arm
 ONBUILD COPY --from=balenalib/rpi-alpine:3.10 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static