diff --git a/ansible/test/molecule-docker/Dockerfile b/ansible/test/molecule-docker/Dockerfile
index e4207f2..6181731 100644
--- a/ansible/test/molecule-docker/Dockerfile
+++ b/ansible/test/molecule-docker/Dockerfile
@@ -3,6 +3,7 @@
 ARG USER_ID
 ARG GROUP_ID
 ARG DOCKER_GROUP_ID
+ARG DOCKER_USER
 
 # When user/group provided, create user to have matching ids (for the host user)
 # to avoid this docker writing files as root owned
@@ -10,11 +11,12 @@
     # shadow needed for addgroup
     # sshpass needed for accessing docker_host (localhost) with ssh and without password prompt
     apk --no-cache add shadow sshpass && \
-    addgroup -g ${GROUP_ID} molecule && \
-    adduser -D -u ${USER_ID} -G molecule molecule && \
+    addgroup -g ${GROUP_ID} ${DOCKER_USER} && \
+    adduser -D -u ${USER_ID} -G ${DOCKER_USER} ${DOCKER_USER} && \
     # Add user to same docker group as in docker_host to be able to use docker driver as sudo
     groupadd docker-host -g ${DOCKER_GROUP_ID} && \
-    usermod -aG ${DOCKER_GROUP_ID} molecule \
+    usermod -aG ${DOCKER_GROUP_ID} ${DOCKER_USER} \
 ;fi
 
-USER molecule
+USER ${DOCKER_USER}
+