diff --git a/entrypoint.sh b/entrypoint.sh
index ad8f55a..3a61d02 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -16,54 +16,26 @@ eval "$(fixuid -q)"
 if [ "${HOME_USER-}" ]; then
   USER="$HOME_USER"
   if [ "$HOME_USER" != "$(whoami)" ]; then
-    # if ! id -u $HOME_USER > /dev/null 2>&1; then
-      # Create a user with the same UID as the host user.
-      # sudo adduser --disabled-password --gecos "" ${HOME_USER}
-      # sudo echo "$HOME_USER ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/nopasswd > /dev/null
+    sudo adduser --disabled-password --gecos "" ${HOME_USER}
+    sudo echo "$HOME_USER ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/nopasswd > /dev/null
+    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 "$HOME_USER" vscode
+    sudo groupmod -n "$HOME_USER" vscode
 
-      # Set the default shell to bash for VS Code Remote - Containers
-      # sudo usermod --login "$HOME_USER" vscode
-      # sudo groupmod -n "$HOME_USER" vscode
-      # sudo sed -i "/vscode/d" /etc/sudoers.d/nopasswd
-
-      # Crear el nuevo directorio home si no existe
-      # if [ -d "/home/${HOME_USER}" ]; then
-        # Si existe, hacer una copia de seguridad de los archivos existentes
-        # sudo mv /home/${HOME_USER} /home/${HOME_USER}_backup
-      # fi
-
-      # Cambiar el directorio home del usuario vscode a /home/${HOME_USER}
-      # sudo usermod -d /home/${HOME_USER} -m vscode
-      # sudo usermod -d /home/${HOME_USER} vscode
-      
-     su - ${HOME_USER}
-    # fi
-    # Copy environment variables from vscode user to HOME_USER
-    # env | grep -v 'HOME_USER' | while read -r line; do
-      # sudo su - ${HOME_USER} -c "echo 'export $line' >> ~/.bashrc"
-    # done
-    # sudo -u $HOME_USER -i
-
-    # sudo cd /home/${HOME_USER}
-    sudo chown -R ${HOME_USER}:${HOME_USER} /home/${HOME_USER}
+    sudo sed -i "/vscode/d" /etc/sudoers.d/nopasswd
+    sudo cd /home/${HOME_USER}
   fi
 fi
 
 
 #Creating extensions folder
-if [ ! -d "/home/${HOME_USER}/.config/Code" ]; then
-  sudo mkdir -p /home/${HOME_USER}/.config/Code
-fi
+sudo mkdir /home/${HOME_USER}/.config/Code
 sudo chmod -R a+rwX /home/${HOME_USER}/.config/Code
-
-if [ ! -d "/home/${HOME_USER}/.vscode-server" ]; then
-  sudo mkdir -p /home/${HOME_USER}/.vscode-server
-fi
+sudo mkdir /home/${HOME_USER}/.vscode-server
 sudo chmod -R a+rwX /home/${HOME_USER}/.vscode-server
-
-if [ ! -d "/home/${HOME_USER}/.vscode-server-insiders" ]; then
-  sudo mkdir -p /home/${HOME_USER}/.vscode-server-insiders
-fi
+sudo mkdir /home/${HOME_USER}/.vscode-server-insiders
 sudo chmod -R a+rwX /home/${HOME_USER}/.vscode-server-insiders
 
 # Check if the data.json file exists
@@ -88,14 +60,8 @@ else
     echo "File extensions.json not found"
 fi
 
-# Allow users to have scripts run on container startup to prepare workspace.
-# https://github.com/coder/code-server/issues/5177
-#if [ -d "${ENTRYPOINTD}" ]; then
-  #find "${ENTRYPOINTD}" -type f -executable -print -exec {} \;
-#fi
-
 if [[ -z "${VSCODE_TUNNEL_NAME}" ]]; then
-    exec dumb-init sudo su - ${HOME_USER} -c "code tunnel --accept-server-license-terms $@"
+    sudo su - ${HOME_USER} -c "code tunnel --accept-server-license-terms"
 else
-    exec dumb-init sudo su - ${HOME_USER} -c "code tunnel --accept-server-license-terms --name ${VSCODE_TUNNEL_NAME} $@"
+    sudo su - ${HOME_USER} -c "code tunnel --accept-server-license-terms --name ${VSCODE_TUNNEL_NAME}"
 fi
diff --git a/version.txt b/version.txt
index 8799612..7168dea 100755
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.0.24
\ No newline at end of file
+2.0.25
\ No newline at end of file