diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/Manifest b/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/Manifest
new file mode 100644
index 0000000000..c730182a28
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/Manifest
@@ -0,0 +1 @@
+DIST google-cloud-sdk-108.0.0-linux-x86_64.tar.gz 7533227 SHA256 2cd451c11553e20fef4c234fc09fd2bb299786db586e9c49cf4700e1bd7c8ba3 SHA512 3db135cb26b3cd713ec8eb74205cc08bc6f5e5e6c2e76908d76d45e146fdc2489f3a01710178c43b2a568c3de78604a757441b49d440d8dfc7e5c0e9a4adce8e WHIRLPOOL 6857b2435d5062c6aa029c88f3e4692d96e051808155b09adf680b2d8d0b9806559be08aef7fa0261ed84512b5a93e4e78ad01bf9ed3669b1b16d8ce520c58fc
diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/files/0001-Hardcode-the-root-directory.patch b/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/files/0001-Hardcode-the-root-directory.patch
new file mode 100644
index 0000000000..8e59f0c603
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/files/0001-Hardcode-the-root-directory.patch
@@ -0,0 +1,25 @@
+From b75e17459bf1201c40e1ff372ec43c1c33caa57a Mon Sep 17 00:00:00 2001
+From: Alex Crawford <alex.crawford@coreos.com>
+Date: Wed, 18 May 2016 18:45:18 -0700
+Subject: [PATCH] Hardcode the root directory
+
+---
+ bin/gcloud | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/gcloud b/bin/gcloud
+index e3bec46..ef62c98 100755
+--- a/bin/gcloud
++++ b/bin/gcloud
+@@ -58,7 +58,7 @@ _cloudsdk_root_dir() {
+       esac
+   done
+ }
+-CLOUDSDK_ROOT_DIR=$(_cloudsdk_root_dir "$0")
++CLOUDSDK_ROOT_DIR="/usr/lib/google-cloud-sdk"
+ 
+ # Cloud SDK requires python 2 (2.6 or 2.7)
+ case $CLOUDSDK_PYTHON in
+-- 
+2.7.3
+
diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-108.0.0.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-108.0.0.ebuild
new file mode 100644
index 0000000000..eaf62dbf5b
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-108.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-r1
+
+DESCRIPTION="Command line tool for interacting with Google Compute Engine"
+HOMEPAGE="https://cloud.google.com/sdk/#linux"
+SRC_URI="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${P}-linux-x86_64.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/0001-Hardcode-the-root-directory.patch"
+
+	default
+}
+
+src_install() {
+	dobin "${S}/bin/gcloud"
+
+	insinto "/usr/lib/${PN}"
+	doins -r "${S}/lib"
+}