diff --git a/src/scripts/gcloud-install.sh b/src/scripts/gcloud-install.sh
index c1ffdc5..2062854 100644
--- a/src/scripts/gcloud-install.sh
+++ b/src/scripts/gcloud-install.sh
@@ -5,8 +5,9 @@ if [ ! -z "${AM_PROMPT_DEBUG:-}" ]; then
 fi
 
 __prompt-set-gcloud-path() {
-    if [ -e $HOME/.gcloud/bin/gcloud ]; then
-        export PATH=$PATH:~/.gcloud/bin
+    local GCLOUD_PATH_INC=$HOME/.gcloud/path.bash.inc
+    if [ -e $GCLOUD_PATH_INC ]; then
+        source $GCLOUD_PATH_INC
     fi
 }
 
diff --git a/src/scripts/set-prompt.sh b/src/scripts/set-prompt.sh
index 7998356..5910c21 100644
--- a/src/scripts/set-prompt.sh
+++ b/src/scripts/set-prompt.sh
@@ -51,6 +51,12 @@ __prompt-set-prompt() {
         eval "$(helm completion bash)" 1>/dev/null 2>&1;
     fi
 
+    local GCLOUD_COMPLETION_INC=$HOME/.gcloud/completion.bash.inc
+
+    if [ -e $GCLOUD_COMPLETION_INC ]; then
+        source $GCLOUD_COMPLETION_INC
+    fi
+
     if [ -f $LOCAL_PREFIX/etc/bash_completion ]; then
         source $LOCAL_PREFIX/etc/bash_completion
     elif [ -f /etc/bash_completion ]; then