diff --git a/universal-base/.devcontainer/local-features/setup-user/install.sh b/universal-base/.devcontainer/local-features/setup-user/install.sh
index 2bf94ef..7ca4140 100644
--- a/universal-base/.devcontainer/local-features/setup-user/install.sh
+++ b/universal-base/.devcontainer/local-features/setup-user/install.sh
@@ -9,7 +9,8 @@ fi
 
 # Ensure that login shells get the correct path if the user updated the PATH using ENV.
 rm -f /etc/profile.d/00-restore-env.sh
-echo "" > /etc/profile.d/00-restore-env.sh
+echo $SHELL
+echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
 chmod +x /etc/profile.d/00-restore-env.sh
 
 export DEBIAN_FRONTEND=noninteractive