diff --git a/.devcontainer.json b/.devcontainer.json
index 8fb163fb10..912e6bb7d1 100644
--- a/.devcontainer.json
+++ b/.devcontainer.json
@@ -39,7 +39,8 @@
         "[javascript]": {
           "editor.defaultFormatter": "esbenp.prettier-vscode"
         },
-        "terminal.integrated.defaultProfile.linux": "zsh",
+        "files.trimTrailingWhitespace": true,
+        "terminal.integrated.shell.linux": "/usr/bin/zsh",
         "gitlens.showWelcomeOnInstall": false,
         "gitlens.showWhatsNewAfterUpgrades": false,
         "workbench.startupEditor": "none"