diff --git a/jfrog-oauth/run.sh b/jfrog-oauth/run.sh
index a2c5255..9366df3 100644
--- a/jfrog-oauth/run.sh
+++ b/jfrog-oauth/run.sh
@@ -100,8 +100,8 @@ fi
 
 # Configure the JFrog CLI completion
 echo "📦 Configuring JFrog CLI completion..."
-jf completion $SHELL --install
 SHELLNAME=$(basename $SHELL)
+jf completion $SHELLNAME --install
 if [ "$SHELLNAME" == "bash" ] || [ "$SHELLNAME" == "zsh" ]; then
   if ! grep -q "source $HOME/.jfrog/jfrog_$${SHELLNAME}_completion" ~/.$${SHELLNAME}rc; then
     echo "source $HOME/.jfrog/jfrog_$${SHELLNAME}_completion" >> ~/.$${SHELLNAME}rc
diff --git a/jfrog-token/run.sh b/jfrog-token/run.sh
index 40658d0..2e43bd5 100644
--- a/jfrog-token/run.sh
+++ b/jfrog-token/run.sh
@@ -100,7 +100,8 @@ fi
 
 # Configure the JFrog CLI completion
 echo "📦 Configuring JFrog CLI completion..."
-jf completion $SHELL --install
+SHELLNAME=$(basename $SHELL)
+jf completion $SHELLNAME --install
 if [ "$SHELLNAME" == "bash" ] || [ "$SHELLNAME" == "zsh" ]; then
   if ! grep -q "source $HOME/.jfrog/jfrog_$${SHELLNAME}_completion" ~/.$${SHELLNAME}rc; then
     echo "source $HOME/.jfrog/jfrog_$${SHELLNAME}_completion" >> ~/.$${SHELLNAME}rc