diff --git a/app-admin/google-cloud-cli-bin/google-cloud-cli-bin-505.0.0.ebuild b/app-admin/google-cloud-cli-bin/google-cloud-cli-bin-505.0.0.ebuild
index 047bd52..8f7721d 100644
--- a/app-admin/google-cloud-cli-bin/google-cloud-cli-bin-505.0.0.ebuild
+++ b/app-admin/google-cloud-cli-bin/google-cloud-cli-bin-505.0.0.ebuild
@@ -3,6 +3,11 @@
 
 EAPI=8
 
+
+PYTHON_COMPAT=( python3_{10..13} python3_13t )
+
+inherit python-single-r1
+
 DESCRIPTION="Interact with the Google Cloud Platform"
 HOMEPAGE="https://cloud.google.com/cli"
 SITE="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads"
@@ -13,22 +18,42 @@ arm64? ( ${SITE}/google-cloud-cli-${PV}-linux-arm.tar.gz )
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 arm"
-
-QA_PREBUILT="
-google-cloud-sdk/bin/anothoscli
-google-cloud-sdk/bin/gcloud-crc32c
+KEYWORDS="amd64 arm64"
+IUSE="anthoscli"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+DEPEND="
+virtual/libcrypt:=
+${PYTHON_DEPS}
 "
-RESTRICT="bindist mirror"
-S="${WORKDIR}"
+RDEPEND="${DEPEND}"
+RESTRICT="bindist mirror strip"
+S="${WORKDIR}/google-cloud-sdk"
+
+src_prepare() {
+	default
+
+	rm -rf deb rpm install.*
+	rm -rf "platform/gsutil/third_party/crcmod_osx"
+	rm -rf "platform/bundledpythonunix"
+	find -type d -name "python2" -prune -exec rm -rf "{}" \;
+
+	use anthoscli || rm bin/anthoscli
+
+	python_fix_shebang --force .
+}
 
 src_install() {
-  mkdir -p "${D}/opt/google-cloud-sdk"
-  cp -r "${S}/google-cloud-sdk/"* "${D}/opt/google-cloud-sdk" || die "Install failed!"
+	dodir /usr/share/google-cloud-sdk
+	cp -R "${S}/" "${ED}/usr/share/" || die "Install failed!"
 
-  dosym "${D}/opt/google-cloud-sdk/bin/gcloud" /usr/bin/gcloud
-  dosym "${D}/opt/google-cloud-sdk/bin/gsutil" /usr/bin/gsutil
+	dosym "../share/google-cloud-sdk/bin/gcloud" /usr/bin/gcloud
+	dosym "../share/google-cloud-sdk/bin/gcloud-crc32c" /usr/bin/gcloud-crc32c
+	dosym "../share/google-cloud-sdk/bin/gsutil" /usr/bin/gsutil
+	dosym "../share/google-cloud-sdk/bin/bq" /usr/bin/bq
+	dosym "../share/google-cloud-sdk/bin/docker-credential-gcloud" /usr/bin/docker-credential-gcloud
+	dosym "../share/google-cloud-sdk/bin/git-credential-gcloud.sh" /usr/bin/git-credential-gcloud.sh
 
-  chmod 4755 "${D}/opt/google-cloud-sdk/bin/gsutil"
-  chmod 4755 "${D}/opt/google-cloud-sdk/bin/gcloud"
-}
+	use anthoscli && dosym "../share/google-cloud-sdk/bin/anthoscli" /usr/bin/anthoscli
+
+	python_optimize "${ED}/usr/share/google-cloud-sdk"
+}
\ No newline at end of file