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 aa0c221166..a05fe01313 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,2 +1,3 @@
 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
+DIST containers-image-5.36.2.tar.gz 764570 BLAKE2B eefd4dbdbc8e4ccf0123e641bf38287667e7b0999672349739f8d589609652254a6a93be5ee471d43a0f7433548d7a2bea304dc2868e180f663f5354706f521d SHA512 14355b1e97d5f1f778442758c5547e0892e1c6919fd33ff604ec2065198addb89e504a29fac447816e0d8479bba9a06364887cd854db475a4a28d8562cce0777
diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.35.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.35.0.ebuild
index 921fadc2e3..e588d895ad 100644
--- a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.35.0.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"
diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.36.2.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.36.2.ebuild
new file mode 100644
index 0000000000..921fadc2e3
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-image/containers-image-5.36.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 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}"/remove-go-as-bdepend-5.34.2.patch
+)
+
+src_compile() {
+	emake docs
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	insinto /etc/containers
+	doins registries.conf
+}