diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index a3515d1b3..ccb53d490 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -13,7 +13,7 @@ COPY --from=confetty /go/bin/confetty /usr/local/bin/confetty
 
 # Install Docker CLI and Docker Compose plugin
 RUN apt-get update && \
-    apt-get install -y ca-certificates curl gnupg lsb-release apt-utils direnv screen && \
+    apt-get install -y ca-certificates curl gnupg lsb-release apt-utils direnv screen zsh-autosuggestions && \
     mkdir -p /etc/apt/keyrings && \
     curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \
     echo \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3de764f57..a2fa66862 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -36,7 +36,7 @@
     },
     "workspaceFolder": "/workspace/examples",
     "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind",
-    
+
     "customizations": {
       "vscode": {
         "extensions": [
@@ -56,7 +56,7 @@
             "workbench.editor.autoLockGroups": {
               "readme": "/welcome.md"
             },
-            "workbench.editorAssociations": {   
+            "workbench.editorAssociations": {
                 "*.md": "vscode.markdown.preview.editor"
             },
             "terminal.integrated.tabs.title": "Atmos (${process})",
@@ -77,4 +77,4 @@
           }
       }
     }
-  } 
+  }
diff --git a/.devcontainer/rootfs/home/vscode/.zsh_history b/.devcontainer/rootfs/home/vscode/.zsh_history
index d31812387..99934c9a1 100644
--- a/.devcontainer/rootfs/home/vscode/.zsh_history
+++ b/.devcontainer/rootfs/home/vscode/.zsh_history
@@ -1,12 +1,9 @@
-: 1640995200:0;atmos terraform plan myapp --stack dev
-: 1640995201:0;atmos terraform plan myapp --stack staging
-: 1640995202:0;atmos terraform plan myapp --stack prod
-: 1640995203:0;atmos terraform apply myapp --stack dev
-: 1640995204:0;atmos terraform apply myapp --stack staging
-: 1640995205:0;atmos terraform apply myapp --stack prod
-: 1640995206:0;atmos terraform plan myapp --stack dev
-: 1640995207:0;atmos terraform plan myapp --stack staging
-: 1640995208:0;atmos terraform plan myapp --stack prod
-: 1640995209:0;atmos terraform deploy myapp --stack dev
-: 1640995210:0;atmos terraform deploy myapp --stack staging
-: 1640995211:0;atmos terraform deploy myapp --stack prod
+: 1640995200:0;atmos terraform deploy station --stack prod
+: 1640995201:0;atmos terraform deploy station --stack staging
+: 1640995202:0;atmos terraform deploy station --stack dev
+: 1640995203:0;atmos terraform apply station --stack prod
+: 1640995204:0;atmos terraform apply station --stack staging
+: 1640995205:0;atmos terraform apply station --stack dev
+: 1640995206:0;atmos terraform plan station --stack prod
+: 1640995207:0;atmos terraform plan station --stack staging
+: 1640995208:0;atmos terraform plan station --stack dev
diff --git a/.devcontainer/rootfs/home/vscode/.zshrc b/.devcontainer/rootfs/home/vscode/.zshrc
index 43c5db598..9138abc1e 100644
--- a/.devcontainer/rootfs/home/vscode/.zshrc
+++ b/.devcontainer/rootfs/home/vscode/.zshrc
@@ -16,6 +16,14 @@ export CODESPACE_HTTPS_URL="http://${CODESPACE_HTTPS_HOSTNAME}"
 # Install atmos completion
 eval $(atmos completion zsh)
 
+# Enable zsh autosuggestions
+autoload -Uz compinit
+compinit
+
+export ZSH_AUTOSUGGEST_STRATEGY=(history completion)
+source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+bindkey '\t' end-of-line
+
 # Setup some aliases
 alias tree='tree -CAF --gitignore -I ".git" -I "terraform.tfstate*"'
 alias bat='bat --style header,numbers --theme="GitHub"'
@@ -26,7 +34,7 @@ export DIRENV_LOG_FORMAT=""
 find /workspace/examples -name '.envrc' -execdir direnv allow \;
 
 # Enable Starship prompt
-eval "$(starship init zsh)" 
+eval "$(starship init zsh)"
 
 # Celebrate! 🎉
 if [ "${TERM}" != "screen.xterm-256color" ]; then