diff --git a/Dockerfile b/Dockerfile
index 6e28072..f56115b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,8 +47,4 @@ RUN sudo sysctl -w fs.inotify.max_user_watches=524288
 ADD ./entrypoint.sh /usr/bin/entrypoint.sh
 RUN sudo chmod +x /usr/bin/entrypoint.sh
 
-USER 1000
-ENV USER=vscode
-WORKDIR /home/vscode
-
 ENTRYPOINT ["/usr/bin/entrypoint.sh"]
\ No newline at end of file
diff --git a/entrypoint.sh b/entrypoint.sh
index d3791e5..707cd69 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -51,7 +51,10 @@ if [ "${HOME_USER-}" ]; then
     sudo su -l ${HOME_USER}
 
     # Delete the vscode user
-    sudo userdel vscode
+    sudo userdel -r vscode
+  else
+    # Switch to the user specified by $HOME_USER and start an interactive shell session.
+    sudo su -l ${HOME_USER}
   fi
 fi
 
diff --git a/version.txt b/version.txt
index 252f231..7ba8820 100755
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.0.48
\ No newline at end of file
+2.0.49
\ No newline at end of file