diff --git a/dev-util/kubetail-bin/kubetail-bin-0.7.5.ebuild b/dev-util/kubetail-bin/kubetail-bin-0.7.5.ebuild
index a336466c8b..d251c43454 100644
--- a/dev-util/kubetail-bin/kubetail-bin-0.7.5.ebuild
+++ b/dev-util/kubetail-bin/kubetail-bin-0.7.5.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit shell-completion
+
 DESCRIPTION="Real-time logging dashboard for Kubernetes"
 HOMEPAGE="https://www.kubetail.com"
 
@@ -21,7 +23,6 @@ KEYWORDS="~amd64 ~arm64"
 RESTRICT="strip"
 
 QA_PREBUILT="usr/bin/kubetail"
-inherit shell-completion
 
 src_install() {
 	cp "${DISTDIR}/${P}-linux-${ARCH}" "${T}/kubetail" || die
@@ -29,7 +30,6 @@ src_install() {
 
 	dobin "${T}/kubetail" || die
 
-	# If the binary can generate completions at build time, do it:
 	if "${T}/kubetail" completion bash >/dev/null 2>&1 ; then
 		"${T}/kubetail" completion bash > "${T}/kubetail.bash" || die
 		"${T}/kubetail" completion zsh > "${T}/kubetail.zsh" || die
diff --git a/dev-util/kubetail-bin/kubetail-bin-0.8.2.ebuild b/dev-util/kubetail-bin/kubetail-bin-0.8.2.ebuild
index a336466c8b..d251c43454 100644
--- a/dev-util/kubetail-bin/kubetail-bin-0.8.2.ebuild
+++ b/dev-util/kubetail-bin/kubetail-bin-0.8.2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit shell-completion
+
 DESCRIPTION="Real-time logging dashboard for Kubernetes"
 HOMEPAGE="https://www.kubetail.com"
 
@@ -21,7 +23,6 @@ KEYWORDS="~amd64 ~arm64"
 RESTRICT="strip"
 
 QA_PREBUILT="usr/bin/kubetail"
-inherit shell-completion
 
 src_install() {
 	cp "${DISTDIR}/${P}-linux-${ARCH}" "${T}/kubetail" || die
@@ -29,7 +30,6 @@ src_install() {
 
 	dobin "${T}/kubetail" || die
 
-	# If the binary can generate completions at build time, do it:
 	if "${T}/kubetail" completion bash >/dev/null 2>&1 ; then
 		"${T}/kubetail" completion bash > "${T}/kubetail.bash" || die
 		"${T}/kubetail" completion zsh > "${T}/kubetail.zsh" || die
diff --git a/dev-util/kubetail-bin/metadata.xml b/dev-util/kubetail-bin/metadata.xml
index 346095b6f3..ad29894e56 100644
--- a/dev-util/kubetail-bin/metadata.xml
+++ b/dev-util/kubetail-bin/metadata.xml
@@ -5,10 +5,6 @@
     <email>andres@kubetail.com</email>
     <name>Andres Morey</name>
   </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <upstream>
     <remote-id type="github">kubetail-org/kubetail</remote-id>
   </upstream>