diff --git a/.devcontainer/.bashrc b/.devcontainer/.bashrc
index 855ea755..9fdb8f69 100644
--- a/.devcontainer/.bashrc
+++ b/.devcontainer/.bashrc
@@ -1,6 +1,8 @@
 export LS_OPTIONS='-F --color=auto'
-eval "`dircolors`"
 alias ls='ls $LS_OPTIONS'
+if [ "${CODESPACES}" = "true" ]; then
+  export WORKSPACE_DIR="$HOME/workspace/zmk"
+fi
 if [ -f "$WORKSPACE_DIR/zephyr/zephyr-env.sh" ]; then
   source "$WORKSPACE_DIR/zephyr/zephyr-env.sh"
 fi
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 940b78b8..14feeff4 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -3,6 +3,9 @@
   "dockerFile": "Dockerfile",
   "extensions": ["ms-vscode.cpptools"],
   "runArgs": ["--security-opt", "label=disable"],
-  "containerEnv": {"WORKSPACE_DIR": "${containerWorkspaceFolder}"}
+  "containerEnv": {"WORKSPACE_DIR": "${containerWorkspaceFolder}"},
+  "settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
 }