diff --git a/Dockerfile b/Dockerfile
index 3b5a970..d8896b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,6 +51,5 @@ RUN chmod 755 /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 
 EXPOSE 80 443 5222 5269 5347 5280 5281
-USER prosody
 ENV __FLUSH_LOG yes
 CMD ["prosody", "-F"]
diff --git a/entrypoint.sh b/entrypoint.sh
index d018fa6..76f0bb1 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+usermod -u "$(stat -c %u /var/lib/prosody/.)" prosody
+
 if [[ "$1" != "prosody" ]]; then
     exec prosodyctl "$@"
     exit 0;
@@ -10,4 +12,4 @@ if [ "$LOCAL" -a  "$PASSWORD" -a "$DOMAIN" ] ; then
     prosodyctl register "$LOCAL" "$DOMAIN" "$PASSWORD"
 fi
 
-exec "$@"
+runuser -u prosody -- "$@"