diff --git a/entrypoint.sh b/entrypoint.sh
index ced1799..6ad38e4 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -4,7 +4,9 @@ set -eu
 # Check if we are root
 if [ "$(id -u)" != "0" ]; then
    echo "This script must be run as root" 1>&2
-   exec sudo /usr/bin/entrypoint.sh
+   sudo bash -c "echo HOME_USER=$HOME_USER >> /etc/environment"
+   sudo bash -c "echo VSCODE_TUNNEL_NAME=$VSCODE_TUNNEL_NAME >> /etc/environment"
+   exec sudo bash -c "source /etc/environment; /usr/bin/entrypoint.sh"
 fi
 
 if [[ -z "${HOME_USER-}" ]]; then
diff --git a/version.txt b/version.txt
index 604a75f..07d2de1 100755
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.0.57
\ No newline at end of file
+2.0.58
\ No newline at end of file