diff --git a/Dockerfile b/Dockerfile
index 889095e..9d404ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,9 +19,6 @@ RUN mkdir -p /var/lib/prosody /var/log/prosody /var/run/prosody /etc/prosody/cer
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
-# Switch to prosody user
-USER prosody
-
 # Expose Prosody ports
 # 5222: Client to Server (C2S)
 # 5269: Server to Server (S2S)
diff --git a/entrypoint.sh b/entrypoint.sh
index dea9adc..db29415 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -59,4 +59,6 @@ else
 fi
 
 echo "Starting Prosody..."
-exec "$@"
+
+# Switch to prosody user and execute prosody
+exec su prosody -c "$(printf '%s ' "$@")"