diff --git a/roles/shell-dotfiles/files/functions b/roles/shell-dotfiles/files/functions
index 161833d..6a015b0 100644
--- a/roles/shell-dotfiles/files/functions
+++ b/roles/shell-dotfiles/files/functions
@@ -125,12 +125,24 @@ function kubectl (){
     if [[ -z $KUBECTL_SHOW_CONTEXT ]]
     then
 	source <($KUBECTL_BIN completion zsh)
-	source <(kops completion zsh)
+    # Add support to completion when using the kubectl alias ku
+	source <($KUBECTL_BIN completion zsh | sed "s/kubectl/ku/g")
     fi
     KUBECTL_SHOW_CONTEXT="k8s-$($KUBECTL_BIN config current-context)"
     $KUBECTL_BIN "$@"
 }
 
+## kops
+KOPS_BIN=`which kops`
+function kops(){
+    if [[ -z $KOPS_SHOW_CONTEXT ]]
+    then
+	source <($KOPS_BIN completion zsh)
+    fi
+    KOPS_SHOW_CONTEXT="k8s-$($KOPS_BIN config current-context)"
+    $KOPS_BIN "$@"
+}
+
 
 ## molecule
 MOLECULE_BIN=`which molecule`