diff --git a/entrypoint.sh b/entrypoint.sh
index 1ebeb4a..3a61d02 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -18,11 +18,11 @@ if [ "${HOME_USER-}" ]; then
   if [ "$HOME_USER" != "$(whoami)" ]; then
     sudo adduser --disabled-password --gecos "" ${HOME_USER}
     sudo echo "$HOME_USER ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/nopasswd > /dev/null
-    su - $HOME_USER
+    sudo -u $HOME_USER -i
     # Unfortunately we cannot change $HOME as we cannot move any bind mounts
     # nor can we bind mount $HOME into a new home as that requires a privileged container.
-    sudo usermod --login "$DOCKER_USER" vscode
-    sudo groupmod -n "$DOCKER_USER" vscode
+    sudo usermod --login "$HOME_USER" vscode
+    sudo groupmod -n "$HOME_USER" vscode
 
     sudo sed -i "/vscode/d" /etc/sudoers.d/nopasswd
     sudo cd /home/${HOME_USER}
diff --git a/version.txt b/version.txt
index 6a0ca2d..e8f41f0 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.0.7
\ No newline at end of file
+2.0.8
\ No newline at end of file