diff --git a/Dockerfile b/Dockerfile
index d3294a7a643c4e5cbedc7a43a41659514a299660..2a37b9ebb1ea753ba8d58029b6a827150e0cc244 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,4 +2,8 @@ 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
+    apt-get --quiet install --yes python3 python3-lxml uidmap
+
+RUN useradd -r -u 1001 -g builduser builduser
+USER builduser
+RUN curl -fsSL https://get.docker.com/rootless | sh