diff --git a/Dockerfile b/Dockerfile
index 2a37b9ebb1ea753ba8d58029b6a827150e0cc244..2cb453c37d382f729f20f7fa4a24689615a8c2a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,18 @@ ARG SDK_VERSION
 FROM k8r.eu/justjanne/android-sdk:$SDK_VERSION
 
 RUN apt-get --quiet update --yes && \
-    apt-get --quiet install --yes python3 python3-lxml uidmap
+    apt-get --quiet install --yes python3 python3-lxml uidmap iptables
 
-RUN useradd -r -u 1001 -g builduser builduser
-USER builduser
+ARG UID=1000
+ARG GID=1000
+RUN mkdir /build/ && chown 1000:1000 /build
+RUN groupadd --gid ${GID} build
+RUN useradd --uid ${UID} --gid ${GID} --home /build build
+USER build
+
+ARG SKIP_IPTABLES=1
 RUN curl -fsSL https://get.docker.com/rootless | sh
+
+ARG XDG_RUNTIME_DIR=/build/.docker/run
+ARG PATH=/build/bin:$PATH
+ARG DOCKER_HOST=unix:///build/.docker/run/docker.sock