diff --git a/app-admin/openshift-client-tools/Manifest b/app-admin/openshift-client-tools/Manifest
deleted file mode 100644
index 863ba5b..0000000
--- a/app-admin/openshift-client-tools/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST openshift-client-tools-3.7.0.tar.gz 103209189 BLAKE2B d3be7d636ef7a9d04a0f36f19121dfb8b058cb7fb4455ebc5feb49238abc849aeb89ac95fac0a32f151d1d8b88634f98de92c7ac7b10c8662bbbb52bbd8c00bf SHA512 6cd4e97a26648114a273243ab6e4d3f5024ccccf4c1ba339ff2b6b3fcaf1dac35f971f4da5462316c6d94eab5bd8baff694bd7af132ced5462c3349b6b3c70f8
-EBUILD openshift-client-tools-3.7.0.ebuild 1122 BLAKE2B 1e94f045b55f5cbbd7a24914478842aa8096b7733d49458e332dc8a8a845a7b24a5ac201e86a82b7006cb0ad9567861fa4887f6c970e24429f5f6a7d14592d74 SHA512 347aec397817e502127fcf4be184d6276e3d6943b3ad90f0e8829e373a95ff83915b6b7a1359171a97ddf8edb23aad35f17e24b6f8ced248768e4cc347f9541c
diff --git a/app-admin/openshift-client-tools/openshift-client-tools-3.7.0.ebuild b/app-admin/openshift-client-tools/openshift-client-tools-3.7.0.ebuild
deleted file mode 100644
index f0df887..0000000
--- a/app-admin/openshift-client-tools/openshift-client-tools-3.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Enterprise Kubernetes for Developers (Client Tools)"
-HOMEPAGE="https://www.openshift.org"
-SRC_URI="https://github.com/openshift/origin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion kerberos"
-
-DEPEND="dev-lang/go
-	kerberos? ( app-crypt/mit-krb5 )"
-RDEPEND="bash-completion? ( >=app-shells/bash-completion-2.3-r1 )"
-
-S="${WORKDIR}/origin-${PV}"
-
-src_compile() {
-	use kerberos && MY_TAGS="-tags=gssapi"
-
-	export OS_GIT_CATALOG_VERSION="v${PV}"
-	export OS_GIT_MINOR=""
-	export OS_GIT_MAJOR=""
-	export OS_GIT_VERSION="v${PV}"
-
-	emake all WHAT="cmd/oc ${MY_TAGS} -v"
-
-	emake all WHAT="tools/gendocs -v"
-	emake all WHAT="tools/genman -v"
-	hack/generate-docs.sh || exit 1
-}
-
-src_install() {
-	case "${ARCH}" in
-		x86)	MY_ARCH="386" ;;
-		*)		MY_ARCH="${ARCH}" ;;
-	esac
-
-	dobin "_output/local/bin/linux/${MY_ARCH}/oc"
-	doman docs/man/man1/oc*
-	use bash-completion && dobashcomp contrib/completions/bash/oc
-}
diff --git a/sys-cluster/openshift-clients/Manifest b/sys-cluster/openshift-clients/Manifest
new file mode 100644
index 0000000..44182f1
--- /dev/null
+++ b/sys-cluster/openshift-clients/Manifest
@@ -0,0 +1,3 @@
+DIST openshift-clients-4.11.0-202208020706.tar.gz 12457108 BLAKE2B 02f1d7384c2ab5f450d8c3c8a7b08e9b156082335050dbab6ef78ed9c806456e6c2d00c9618e1f0548f7bb784112b36b1fae3bbcbbde0d6556064830dd9d0fc4 SHA512 7f6a6945e407f8c4d6464919c98115c05e70026948de734dc602929ed7a5c97c3f5b8298e5b648b0f3e0913423804a117384ecf5504606bcb5b3c38fa915df85
+EBUILD openshift-clients-4.11.0_p202208020706.ebuild 955 BLAKE2B 8c3fcc2ea64ffc3d2f5e6ee75e7f8d4281361f7c6e246d7402508e8c0a70e41c03bc100e92dafe61d09b1be017cca418bb0b0dcab11d89f01d5be7f7702fb15f SHA512 f08071b6b91b5bd053aba637ed27bc115202b93fe2bf60cea298721e706b0dffba89c9662be52c0f23099945ccc992e33c8d29678444e4895ddbf9c8f4968a3a
+MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/openshift-clients/metadata.xml b/sys-cluster/openshift-clients/metadata.xml
new file mode 100644
index 0000000..2e5c726
--- /dev/null
+++ b/sys-cluster/openshift-clients/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kubernetes/kubernetes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-cluster/openshift-clients/openshift-clients-4.11.0_p202208020706.ebuild b/sys-cluster/openshift-clients/openshift-clients-4.11.0_p202208020706.ebuild
new file mode 100644
index 0000000..6a70b7b
--- /dev/null
+++ b/sys-cluster/openshift-clients/openshift-clients-4.11.0_p202208020706.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+OS_VERSION=${PV//_p/-}
+BN=oc
+
+DESCRIPTION="The OpenShift Command Line, part of OKD"
+HOMEPAGE="https://www.okd.io/"
+SRC_URI="https://github.com/openshift/oc/archive/refs/tags/${PN}-${OS_VERSION}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.19
+		virtual/krb5
+		app-crypt/gpgme"
+
+RESTRICT+=" test"
+S="${WORKDIR}/${BN}-${PN}-${OS_VERSION}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake OS_GIT_VERSION="v${OS_VERSION}" OS_GIT_COMMIT='' OS_GIT_TREE_STATE='' 
+}
+
+src_install() {
+	${BN} completion bash > ${BN}.bash || die
+	${BN} completion zsh > ${BN}.zsh || die
+	newbashcomp ${BN}.bash ${BN}
+	insinto /usr/share/zsh/site-functions
+	newins ${BN}.zsh _${BN}
+	./genman docs/generated oc
+	doman docs/generated/*
+	dobin ${BN}
+}