diff --git a/entrypoint.sh b/entrypoint.sh
index 6a5158a..c4af070 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -47,7 +47,10 @@ if [ "${DOCKER_USER-}" ]; then
     sudo groupmod -n "$DOCKER_USER" coder
 
     sudo sed -i "/coder/d" /etc/sudoers.d/nopasswd
+
+    chown -R "$DOCKER_USER":999 /home/coder
   fi
+
 fi
 
 # Allow users to have scripts run on container startup to prepare workspace.
@@ -56,4 +59,4 @@ if [ -d "${ENTRYPOINTD}" ]; then
   find "${ENTRYPOINTD}" -type f -executable -print -exec {} \;
 fi
 
-exec dumb-init /usr/bin/code-server "$@"
+su "$DOCKER_USER" -c "exec dumb-init /usr/bin/code-server $@"