diff --git a/.devcontainer/ci/Dockerfile b/.devcontainer/ci/Dockerfile
index 96001075..e6e945b4 100644
--- a/.devcontainer/ci/Dockerfile
+++ b/.devcontainer/ci/Dockerfile
@@ -1,2 +1,2 @@
-#Ref: https://github.com/devcontainers/ci/issues/191
+# Ref: https://github.com/devcontainers/ci/issues/191
 FROM mcr.microsoft.com/devcontainers/base:alpine
diff --git a/.devcontainer/ci/features/install.sh b/.devcontainer/ci/features/install.sh
index 3c44acd6..2f5d9c2f 100644
--- a/.devcontainer/ci/features/install.sh
+++ b/.devcontainer/ci/features/install.sh
@@ -16,7 +16,7 @@ fi
 apk add --no-cache \
     bash bind-tools ca-certificates curl python3 \
         py3-pip moreutils jq git iputils \
-            openssh-client
+            openssh-client starship
 
 apk add --no-cache \
     --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community \
diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh
index db37fd04..642213a5 100755
--- a/.devcontainer/postCreateCommand.sh
+++ b/.devcontainer/postCreateCommand.sh
@@ -1,5 +1,15 @@
 #!/usr/bin/env bash
 
+# Hook direnv into fish
+cat << EOF > ~/.config/fish/conf.d/direnv.fish
+direnv hook fish | source
+EOF
+
+# Hook starship into fish
+cat << EOF > ~/.config/fish/conf.d/starship.fish
+starship init fish | source
+EOF
+
 # Export the direnv environment variables
 task workstation:direnv