diff --git a/Containerfile b/Containerfile
index e61e674..5ac2b23 100644
--- a/Containerfile
+++ b/Containerfile
@@ -22,10 +22,15 @@ COPY --from=builder /usr/bin/knot /usr/bin
 COPY --from=builder /VERSION /
 COPY rootfs /
 
-RUN groupadd -g 9001 git && \
-    useradd -u 9001 -g git -m -d /home/git -s /bin/bash -p "*" git && \
+ARG UID=1000
+ARG GID=1000
+
+RUN groupadd -g $GID git && \
+    useradd -u $UID -g git -m -d /home/git -s /bin/bash -p "*" git && \
     mkdir -p /etc/ssh/keys && \
     chmod 755 /etc && \
     chmod -R 755 /etc/s6-overlay
 
+USER git
+
 ENTRYPOINT ["/init"]