diff --git a/app-containers/cri-o/Manifest b/app-containers/cri-o/Manifest
index 28bb3eba4f452..31a11cdf1eaa6 100644
--- a/app-containers/cri-o/Manifest
+++ b/app-containers/cri-o/Manifest
@@ -1,4 +1 @@
-DIST cri-o-1.31.2.tar.gz 19921920 BLAKE2B 4e60c15d73691dabab8f7f1229b0b8e534393128a53cd31639509454286ec237cf5e6bf258c8e06478b76b872b6e1e8d3481b19a277be4c0bf756b1a6d858d95 SHA512 be42d08ee2a9d030d9279dee269d121822de5c74aafa765688c91383a284cda890aa969a5a2b0649835893bd3b382e6bf2a1f81991710b479b4159877e0626aa
-DIST cri-o-1.31.4.tar.gz 19919611 BLAKE2B b9c2a855c8f8b780e4f77172dab0070cf9fa96216c1b03d1c06b42ac1385dbd9e57e4dadd88a54c4c0dde8366dda95293c1763c3fec554b79573ddd8da02aa6e SHA512 c10cb633a2bbc7c3d0fdbae7b5541fc948804ca797a71532e0dcd783d0e56158650ea93d3cce36995922e04f9f22c27c4255bc40a81930e263ebb0c710372a06
-DIST cri-o-1.34.3.tar.gz 21788931 BLAKE2B 2c4c87d5a07f479d306c8f511257a3194fde907aea7af10745cbd909c972c875c8d9b81f9ce922ba89b2451d47ae31f62ae5bcb7038aa525fb8a79bfdfb4b28f SHA512 031396b4e5ac49a484c32857ed156b51940025d973996b69db9b40cb96305072d68e980222d9f23185dd7fb9bb25a21b4858b87ceb46bbe45ff34034f5eaeea9
 DIST cri-o-1.36.1.tar.gz 21684722 BLAKE2B 5b60a98889f502068db449381fdce4d28cb7ce513fa95058fcf704709f3aac46dd07f74e252053208a82d40f577fb6c05b0e1ef296a237ea285121abb6044f72 SHA512 3ab9dd8c202a9d3048e6c6262b5390d10b3d04d0bc6c52e874b5742435c3ecdac45559f47747918d907c469cc81f0fd7ae2146128e5d0af15db0212395da431f
diff --git a/app-containers/cri-o/cri-o-1.31.2.ebuild b/app-containers/cri-o/cri-o-1.31.2.ebuild
deleted file mode 100644
index dc7fce58874d6..0000000000000
--- a/app-containers/cri-o/cri-o-1.31.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT=920af25f2b6fd4f52bced0e73f696e48464da543
-
-inherit go-module
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
-HOMEPAGE="https://cri-o.io/"
-SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="btrfs +device-mapper selinux systemd"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	app-containers/conmon
-	app-containers/runc
-	dev-libs/glib:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	net-firewall/conntrack-tools
-	net-firewall/iptables
-	app-containers/cni-plugins
-	net-misc/socat
-	sys-apps/iproute2
-	sys-libs/libseccomp:=
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )
-	selinux? ( sys-libs/libselinux:= )
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-	!<app-containers/podman-1.3.2-r1
-	selinux? ( sec-policy/selinux-crio )"
-BDEPEND="sys-apps/which"
-
-src_prepare() {
-	default
-
-	sed -e '/^export GOPROXY=/d' \
-		-e '/^GIT_.*/d' \
-		-e '/	git diff --exit-code/d' \
-		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
-		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
-		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
-		-e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-
-	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
-
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-i contrib/systemd/* || die
-}
-
-src_compile() {
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-		hack/btrfs_installed_tag.sh || die; }
-
-	[[ -f hack/libdm_installed.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
-		hack/libdm_installed.sh || die; }
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		hack/selinux_tag.sh || die; }
-
-	mkdir -p bin || die
-	emake all \
-		GOBIN="${S}/bin" \
-		GO_BUILD="go build ${GOFLAGS}" \
-		GO_MD2MAN="$(which go-md2man)"
-}
-
-src_install() {
-	emake install install.config install.systemd \
-		DESTDIR="${D}" \
-		GO_MD2MAN="$(which go-md2man)" \
-		PREFIX="${D}${EPREFIX}/usr"
-	keepdir /etc/crio
-	mv "${ED}/etc/crio/crio.conf"{,.example} || die
-
-	newinitd "${FILESDIR}/crio.initd" crio
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
-	# Suppress crio log error messages triggered if these don't exist.
-	keepdir /etc/containers/oci/hooks.d
-	keepdir /usr/share/containers/oci/hooks.d
-
-	# Suppress crio "Missing CNI default network" log message.
-	keepdir /etc/cni/net.d
-	insinto /etc/cni/net.d
-	doins contrib/cni/99-loopback.conflist
-}
diff --git a/app-containers/cri-o/cri-o-1.31.4.ebuild b/app-containers/cri-o/cri-o-1.31.4.ebuild
deleted file mode 100644
index 3bc77ec3ed720..0000000000000
--- a/app-containers/cri-o/cri-o-1.31.4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT=33d75981bee230f791709975125d7386fe2c530a
-
-inherit go-module
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
-HOMEPAGE="https://cri-o.io/"
-SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="btrfs +device-mapper selinux systemd"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	app-containers/conmon
-	app-containers/runc
-	dev-libs/glib:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	net-firewall/conntrack-tools
-	net-firewall/iptables
-	app-containers/cni-plugins
-	net-misc/socat
-	sys-apps/iproute2
-	sys-libs/libseccomp:=
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )
-	selinux? ( sys-libs/libselinux:= )
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-	!<app-containers/podman-1.3.2-r1
-	selinux? ( sec-policy/selinux-crio )"
-BDEPEND="sys-apps/which"
-
-src_prepare() {
-	default
-
-	sed -e '/^export GOPROXY=/d' \
-		-e '/^GIT_.*/d' \
-		-e '/	git diff --exit-code/d' \
-		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
-		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
-		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
-		-e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-
-	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
-
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-i contrib/systemd/* || die
-}
-
-src_compile() {
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-		hack/btrfs_installed_tag.sh || die; }
-
-	[[ -f hack/libdm_installed.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
-		hack/libdm_installed.sh || die; }
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		hack/selinux_tag.sh || die; }
-
-	mkdir -p bin || die
-	emake all \
-		GOBIN="${S}/bin" \
-		GO_BUILD="go build ${GOFLAGS}" \
-		GO_MD2MAN="$(which go-md2man)"
-}
-
-src_install() {
-	emake install install.config install.systemd \
-		DESTDIR="${D}" \
-		GO_MD2MAN="$(which go-md2man)" \
-		PREFIX="${D}${EPREFIX}/usr"
-	keepdir /etc/crio
-	mv "${ED}/etc/crio/crio.conf"{,.example} || die
-
-	newinitd "${FILESDIR}/crio.initd" crio
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
-	# Suppress crio log error messages triggered if these don't exist.
-	keepdir /etc/containers/oci/hooks.d
-	keepdir /usr/share/containers/oci/hooks.d
-
-	# Suppress crio "Missing CNI default network" log message.
-	keepdir /etc/cni/net.d
-	insinto /etc/cni/net.d
-	doins contrib/cni/99-loopback.conflist
-}
diff --git a/app-containers/cri-o/cri-o-1.34.3.ebuild b/app-containers/cri-o/cri-o-1.34.3.ebuild
deleted file mode 100644
index 1d535f44d1d4d..0000000000000
--- a/app-containers/cri-o/cri-o-1.34.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT=067a88aedf5d7c658a2acb81afe82d6c3a367a52
-
-inherit go-module
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
-HOMEPAGE="https://cri-o.io/"
-SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="btrfs +device-mapper selinux systemd"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	app-containers/conmon
-	app-containers/runc
-	dev-libs/glib:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	net-firewall/conntrack-tools
-	net-firewall/iptables
-	app-containers/cni-plugins
-	net-misc/socat
-	sys-apps/iproute2
-	sys-libs/libseccomp:=
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )
-	selinux? ( sys-libs/libselinux:= )
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-	!<app-containers/podman-1.3.2-r1
-	selinux? ( sec-policy/selinux-crio )"
-BDEPEND="sys-apps/which"
-
-src_prepare() {
-	default
-
-	sed -e '/^export GOPROXY=/d' \
-		-e '/^GIT_.*/d' \
-		-e '/	git diff --exit-code/d' \
-		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
-		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
-		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
-		-e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-
-	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
-
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-i contrib/systemd/* || die
-}
-
-src_compile() {
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-		hack/btrfs_installed_tag.sh || die; }
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		hack/selinux_tag.sh || die; }
-
-	mkdir -p bin || die
-	emake all \
-		GOBIN="${S}/bin" \
-		GO_BUILD="go build ${GOFLAGS}" \
-		GO_MD2MAN="$(which go-md2man)"
-}
-
-src_install() {
-	emake install install.config install.systemd \
-		DESTDIR="${D}" \
-		GO_MD2MAN="$(which go-md2man)" \
-		PREFIX="${D}${EPREFIX}/usr"
-	keepdir /etc/crio
-	mv "${ED}/etc/crio/crio.conf"{,.example} || die
-
-	newinitd "${FILESDIR}/crio.initd" crio
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
-	# Suppress crio log error messages triggered if these don't exist.
-	keepdir /etc/containers/oci/hooks.d
-	keepdir /usr/share/containers/oci/hooks.d
-
-	# Suppress crio "Missing CNI default network" log message.
-	keepdir /etc/cni/net.d
-	insinto /etc/cni/net.d
-	doins contrib/cni/99-loopback.conflist
-}