diff --git a/kubernetes1.24.changes b/kubernetes1.24.changes
index c3584bb..43776d1 100644
--- a/kubernetes1.24.changes
+++ b/kubernetes1.24.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar  9 10:15:46 UTC 2023 - Robert Munteanu <rombert@apache.org>
+
+- Use upstream fish completions and obsolete external package 
+
 -------------------------------------------------------------------
 Thu Mar  2 13:14:29 UTC 2023 - Priyanka Saggu <priyanka.saggu@suse.com>
 
diff --git a/kubernetes1.24.spec b/kubernetes1.24.spec
index 92c8f4e..8feb6e2 100644
--- a/kubernetes1.24.spec
+++ b/kubernetes1.24.spec
@@ -51,6 +51,7 @@ Patch4:         kubeadm-opensuse-flexvolume.patch
 Patch5:         revert-coredns-image-renaming.patch
 BuildRequires:  bash-completion
 BuildRequires:  fdupes
+BuildRequires:  fish
 BuildRequires:  git
 BuildRequires:  go-go-md2man
 BuildRequires:  golang-packaging
@@ -69,6 +70,9 @@ for management and discovery.
 
 
 
+
+
+
 # packages to build containerized control plane
 
 %package apiserver
@@ -173,7 +177,9 @@ Requires:       kubernetes%{baseversion}-client
 Provides:       kubernetes-client-common = %{version}
 Conflicts:      kubernetes-client-common
 Obsoletes:      kubernetes%{baseversionminus1}-client-common
+Obsoletes:      kubernetes-client-fish-completion
 Recommends:     bash-completion
+Recommends:     fish
 
 %description client-common
 Kubernetes client tools common files
@@ -250,6 +256,10 @@ install -D -m 0644 %{SOURCE22} %{buildroot}%{_fillupdir}/sysconfig.kubelet-kuber
 install -d -m 0755 %{buildroot}%{_datadir}/bash-completion/completions/
 %{buildroot}%{_bindir}/kubectl%{baseversion} completion bash > %{buildroot}%{_datadir}/bash-completion/completions/kubectl
 
+# install the fish completion
+mkdir -p %{buildroot}%{_datadir}/fish/vendor_completions.d
+%{buildroot}%{_bindir}/kubectl%{baseversion} completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/kubectl.fish
+
 # move CHANGELOG-%{baseversion}.md to old location
 mv CHANGELOG/CHANGELOG-%{baseversion}.md .
 
@@ -404,5 +414,6 @@ fi
 %{_mandir}/man1/kubectl.1%{?ext_man}
 %{_mandir}/man1/kubectl-*
 %{_datadir}/bash-completion/completions/kubectl
+%{_datadir}/fish/vendor_completions.d/kubectl.fish
 
 %changelog