diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/Manifest
index 68134bbcee..aa0c221166 100644
--- a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/Manifest
@@ -1,3 +1,2 @@
-DIST containers-image-5.30.0.tar.gz 719070 BLAKE2B 5952ab703b6df793f326dd4fc82f50c5f672e2b9d142e0bc706014092420e3563599d9f1c1f65f743e1a8144b91f92b2326d7bf4c3024b5efb466d777a8ad613 SHA512 89cd0d482bb5d70037ff51413b7abca01d36bc7f39e9dc130c78462e501dae32193137a367d81532afd216a7432e127728147e6e839d5d99eeb6b6680f31d4dc
-DIST containers-image-5.32.2.tar.gz 735422 BLAKE2B a0585c877b4679226d1760bf873ceeb5cba7f5177ab83fa6f8a161b1f3958f3d660445556b13b4221712c241cee94429cabdb1fd4186d4dc6edba7b032fce2bc SHA512 7498f9e446b2c205b033703641f7cfcb6c8bd8f097b12ef3f734c94772d63fc7b9b40a6700d53d93919d2c34772f079aa3cb7d9f9e5a130b6587f4fe2a558df6
 DIST containers-image-5.34.2.tar.gz 766227 BLAKE2B 27593e4d0035aee9eabc1011a837f16369d7985558ae1275e6726ff1b859d09ab036f150dc978ab0290cee7ba2b0878c50edcb131a2eb63ff947567fa1f10c2a SHA512 7e7cc5bfd2e8d71c332f08aab34c1b1cccadcf9f313d9519a294e9dfc370fd48d18f1e00dd0d74a19edf40ac511a544033fc27cf9537dcbb9458f721d88d564d
+DIST containers-image-5.35.0.tar.gz 766486 BLAKE2B c1708dd15eb9e8fdff739425542b5ead5f1e782e62b609b0d81fe4b5ad7ed5c61fe99bb4d9e29ea6d772bb9f093a286ed13c354cab48ad2681e111a073d124d6 SHA512 0acd064451184aa91d331bf113b934de10bf2e9225236b907c86006aed51cf4a8604cc57c73a2ae80848bc090b661548a7127b8b5112143f57c030ef5820333e
diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.30.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.30.0.ebuild
deleted file mode 100644
index 317689821e..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.30.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Default config and docs related to Containers' images"
-HOMEPAGE="https://github.com/containers/image"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/image.git"
-else
-	SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="amd64 arm64 ~loong ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
-RESTRICT='test'
-BDEPEND=">=dev-go/go-md2man-2.0.3"
-RDEPEND="!<=app-containers/containers-common-0.57.0"
-PATCHES=(
-	"${FILESDIR}"/fix-warnings.patch
-)
-
-src_compile() {
-	emake docs
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	insinto /etc/containers
-	doins registries.conf
-}
diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.32.2.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.35.0.ebuild
similarity index 88%
rename from sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.32.2.ebuild
rename to sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.35.0.ebuild
index 4226aabc60..921fadc2e3 100644
--- a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.32.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.35.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="amd64 arm64 ~loong ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi
 
 LICENSE="Apache-2.0"
@@ -22,6 +22,9 @@ SLOT="0"
 RESTRICT='test'
 BDEPEND=">=dev-go/go-md2man-2.0.3"
 RDEPEND="!<=app-containers/containers-common-0.57.0"
+PATCHES=(
+	"${FILESDIR}"/remove-go-as-bdepend-5.34.2.patch
+)
 
 src_compile() {
 	emake docs
diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/files/fix-warnings.patch b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/files/fix-warnings.patch
deleted file mode 100644
index c68cffa858..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/files/fix-warnings.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -5,7 +5,2 @@
-
--GOBIN := $(shell go env GOBIN)
--ifeq ($(GOBIN),)
--GOBIN := $(shell go env GOPATH)/bin
--endif
--
- # when cross compiling _for_ a Darwin or windows host, then we must use openpgp
-@@ -17,3 +12,2 @@
-
--PACKAGES := $(shell GO111MODULE=on go list $(BUILDFLAGS) ./...)
- SOURCE_DIRS = $(shell echo $(PACKAGES) | awk 'BEGIN{FS="/"; RS=" "}{print $$4}' | uniq)