diff --git a/.zshenv b/.zshenv
index 8d990bc..5f3806a 100644
--- a/.zshenv
+++ b/.zshenv
@@ -14,9 +14,6 @@ export PATH="/usr/local/share/npm/bin:$PATH"
 export PATH="/usr/local/sbin:$PATH"
 export PATH="/usr/local/bin:$PATH"
 
-# rbenv
-export PATH="$HOME/.rbenv/bin:$PATH"
-
 # go lang
 export GOPATH=$HOME/.golang
 export GOROOT=/opt/homebrew/opt/go/libexec
diff --git a/.zshrc b/.zshrc
index c96f7b0..84ef71a 100644
--- a/.zshrc
+++ b/.zshrc
@@ -4,9 +4,10 @@
 
 # load rbenv
 if which rbenv > /dev/null; then
-  eval "$(rbenv init -)";
+  eval "$(rbenv init - zsh)";
 fi
 
 # load nvm
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion