diff --git a/.config/zsh/completion/bash.zsh b/.config/zsh/completion/bash.zsh
new file mode 100644
index 0000000..1741e8e
--- /dev/null
+++ b/.config/zsh/completion/bash.zsh
@@ -0,0 +1,5 @@
+#!/bin/zsh
+
+for i ( buildah ) ; do
+    __z_comp_bash $i
+done
diff --git a/.config/zsh/completion/buildah.zsh b/.config/zsh/completion/buildah.zsh
deleted file mode 100644
index 01715a1..0000000
--- a/.config/zsh/completion/buildah.zsh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/zsh
-
-__z_comp_bash buildah
diff --git a/.config/zsh/completion/external.zsh b/.config/zsh/completion/external.zsh
new file mode 100644
index 0000000..026ea93
--- /dev/null
+++ b/.config/zsh/completion/external.zsh
@@ -0,0 +1,9 @@
+#!/bin/zsh
+
+__z_comp__kubectl() { command kubectl completion zsh ; }
+__z_comp__podman() { command podman completion zsh ; }
+
+for i ( kubectl podman ) ; do
+    __z_comp_external $i "__z_comp__$i"
+done
+unset -fm '__z_comp__*'
diff --git a/.config/zsh/completion/fd.zsh b/.config/zsh/completion/fd.zsh
deleted file mode 100644
index 0580de4..0000000
--- a/.config/zsh/completion/fd.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/zsh
-
-__z_comp_system fd
-__z_comp_system fdfind
diff --git a/.config/zsh/completion/k8s.zsh b/.config/zsh/completion/k8s.zsh
deleted file mode 100644
index 1bb22a7..0000000
--- a/.config/zsh/completion/k8s.zsh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/zsh
-
-__z_comp_kubectl() { command kubectl completion zsh ; }
-__z_comp_external kubectl __z_comp_kubectl
-unset -f __z_comp_kubectl
diff --git a/.config/zsh/completion/podman.zsh b/.config/zsh/completion/podman.zsh
deleted file mode 100644
index 0f1fcae..0000000
--- a/.config/zsh/completion/podman.zsh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/zsh
-
-__z_comp_podman() { command podman completion zsh ; }
-__z_comp_external podman __z_comp_podman
-unset -f __z_comp_podman
diff --git a/.config/zsh/completion/system.zsh b/.config/zsh/completion/system.zsh
new file mode 100644
index 0000000..de680d2
--- /dev/null
+++ b/.config/zsh/completion/system.zsh
@@ -0,0 +1,5 @@
+#!/bin/zsh
+
+for i ( fd fdfind hyperfine ) ; do
+    __z_comp_system $i
+done