diff --git a/completion/kubectx.fish b/completion/kubectx.fish
new file mode 100644
index 0000000..eacaac6
--- /dev/null
+++ b/completion/kubectx.fish
@@ -0,0 +1,3 @@
+# kubectx
+complete -f -c kubectx -a "- (kubectl config get-contexts --output='name')"
+
diff --git a/completion/kubens.fish b/completion/kubens.fish
new file mode 100644
index 0000000..cf3e9a5
--- /dev/null
+++ b/completion/kubens.fish
@@ -0,0 +1,3 @@
+# kubens
+complete -f -c kubens -a "(kubectl get ns -o=custom-columns=NAME:.metadata.name --no-headers)"
+