diff --git a/Dockerfile b/Dockerfile
index 744c1e4..4220708 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,10 +4,11 @@ ARG BASE_IMAGE=alpine:latest #Fallback alpine:latest
 FROM ${BASE_IMAGE} AS rootfs-stage
 
 ARG APP_VERSION=${BUILD_TAG}
+ARG S6_ARCH_amd64
 ARG S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION}
 ARG ROOTFS=/root-out
 ARG REL=${APP_VERSION}
-ARG ARCH=x86_64
+ARG ALPINE_ARCH=${ALPINE_ARCH_AMD64}
 ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine
 ARG PACKAGES=alpine-baselayout,\
 alpine-keys,\
@@ -28,14 +29,14 @@ RUN \
     echo "${MIRROR}/${REL}/main"; \
     echo "${MIRROR}/${REL}/community"; \
   } > "${ROOTFS}/etc/apk/repositories" && \
-  apk --root "${ROOTFS}" --no-cache --keys-dir /etc/apk/keys add --arch ${ARCH} --initdb ${PACKAGES//,/ } && \
+  apk --root "${ROOTFS}" --no-cache --keys-dir /etc/apk/keys add --arch ${ALPINE_ARCH} --initdb ${PACKAGES//,/ } && \
   sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow
 
 # add s6 overlay
 ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
 RUN tar -C /root-out -Jxpf /tmp/s6-overlay-noarch.tar.xz
-ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${ARCH}.tar.xz /tmp
-RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${ARCH}.tar.xz
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH_amd64}.tar.xz /tmp
+RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_ARCH_amd64}.tar.xz
 
 # add s6 optional symlinks
 ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index da14a7a..cc27236 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -4,10 +4,11 @@ ARG BASE_IMAGE=alpine:latest #Fallback alpine:latest
 FROM ${BASE_IMAGE} AS rootfs-stage
 
 ARG APP_VERSION=${BUILD_TAG}
+ARG S6_ARCH_aarch64=${S6_ARCH_aarch64}
 ARG S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION}
 ARG ROOTFS=/root-out
 ARG REL=${APP_VERSION}
-ARG ARCH=aarch64
+ARG ALPINE_ARCH=${ALPINE_ARCH_AARCH64}
 ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine
 ARG PACKAGES=alpine-baselayout,\
 alpine-keys,\
@@ -28,14 +29,14 @@ RUN \
     echo "${MIRROR}/${REL}/main"; \
     echo "${MIRROR}/${REL}/community"; \
   } > "${ROOTFS}/etc/apk/repositories" && \
-  apk --root "${ROOTFS}" --no-cache --keys-dir /etc/apk/keys add --arch ${ARCH} --initdb ${PACKAGES//,/ } && \
+  apk --root "${ROOTFS}" --no-cache --keys-dir /etc/apk/keys add --arch ${ALPINE_ARCH} --initdb ${PACKAGES//,/ } && \
   sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow
 
 # add s6 overlay
 ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
 RUN tar -C /root-out -Jxpf /tmp/s6-overlay-noarch.tar.xz
-ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${ARCH}.tar.xz /tmp
-RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${ARCH}.tar.xz
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH_aarch64}.tar.xz /tmp
+RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_ARCH_aarch64}.tar.xz
 
 # add s6 optional symlinks
 ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp
diff --git a/buildargs.env b/buildargs.env
index 2fca100..6fd149c 100644
--- a/buildargs.env
+++ b/buildargs.env
@@ -6,6 +6,10 @@ BASE_IMAGE=alpine:${BUILD_TAG}
 # Examples for BASE_IMAGE
 #alpine:${BUILD_TAG}
 #git.pi-farm.de/pi-farm/docker-baseimage-alpine:v${BUILD_TAG}
+ALPINE_ARCH_AMD64=amd64
+ALPINE_ARCH_AARCH64=aarch64
+S6_ARCH_amd64=x86_64
+S6_ARCH_aarch64=aarch64
 S6_OVERLAY_VERSION=3.2.0.2
 MAINTAINER=pi-farm
 TZ=Europe/Berlin