diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh
index 0ec4bff56ab..a9fd3ab7ae2 100755
--- a/.devcontainer/postCreateCommand.sh
+++ b/.devcontainer/postCreateCommand.sh
@@ -22,7 +22,10 @@ fisher install PatrickF1/fzf.fish
   ./"${KREW}" install krew
 )
 
-export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
+KREW_PATH="${KREW_ROOT:-$HOME/.krew}/bin"
+export PATH="$KREW_PATH:$PATH"
+# add KREW_PATH to fish shell path
+/usr/bin/fish -c "fish_add_path $KREW_PATH"
 
 kubectl krew install pv-mounter
 kubectl krew install cnpg
diff --git a/clustertool/embed/generic/root/DOTREPLACEdevcontainer/postCreateCommand.sh b/clustertool/embed/generic/root/DOTREPLACEdevcontainer/postCreateCommand.sh
index 0ec4bff56ab..a9fd3ab7ae2 100755
--- a/clustertool/embed/generic/root/DOTREPLACEdevcontainer/postCreateCommand.sh
+++ b/clustertool/embed/generic/root/DOTREPLACEdevcontainer/postCreateCommand.sh
@@ -22,7 +22,10 @@ fisher install PatrickF1/fzf.fish
   ./"${KREW}" install krew
 )
 
-export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
+KREW_PATH="${KREW_ROOT:-$HOME/.krew}/bin"
+export PATH="$KREW_PATH:$PATH"
+# add KREW_PATH to fish shell path
+/usr/bin/fish -c "fish_add_path $KREW_PATH"
 
 kubectl krew install pv-mounter
 kubectl krew install cnpg