diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/cloud-config.yml
index 7b274eec54..d7b5a20fe1 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/cloud-config.yml
@@ -106,4 +106,23 @@ coreos:
       id: gce
       name: Google Compute Engine
       home-url: https://cloud.google.com/products/compute-engine/
-      bug-report-url: https://github.com/coreos/coreos-overlay
+      bug-report-url: https://github.com/coreos/bugs/issues
+
+write_files:
+  - path: /etc/profile.d/google-cloud-sdk.sh
+    permissions: 0644
+    content: |
+        #!/bin/sh
+        function _fake_gcloud {
+        cat >&2 <<EOF
+        gcloud, gcutil, and other Google Cloud SDK tools are available from
+        Google via a Docker container named google/cloud-sdk.
+
+        See https://index.docker.io/u/google/cloud-sdk/
+        EOF
+        return 1
+        }
+
+        alias gcloud=_fake_gcloud
+        alias gcutil=_fake_gcloud
+        alias gsutil=_fake_gcloud
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r9.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r8.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r9.ebuild