diff --git a/filesets/base/environment/.envrc b/filesets/base/environment/.envrc
index 9f96d4e..6cff4cc 100644
--- a/filesets/base/environment/.envrc
+++ b/filesets/base/environment/.envrc
@@ -56,4 +56,10 @@ if command -v pyenv 1>/dev/null 2>&1; then eval "$(pyenv init -)"; fi
 export PIPENV_VENV_IN_PROJECT=1
 export PIPENV_SKIP_LOCK=true
 export PIPENV_PYTHON=$PYENV_ROOT/shims/python
-eval "$(pipenv --completion)"
+test -n "$ZSH_VERSION" && eval "$(_PIPENV_COMPLETE=zsh_source pipenv)"
+test -n "$BASH_VERSION" && eval "$(_PIPENV_COMPLETE=bash_source pipenv)"
+
+# Netlify
+if [ -n "$ZSH_VERSION" ]; then
+    test -f "$HOME/.config/netlify/helper/path.zsh.inc" && source "$HOME/.config/netlify/helper/path.zsh.inc"
+fi