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
new file mode 100644
index 0000000000..691e93a139
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/cloud-config.yml
@@ -0,0 +1,14 @@
+#cloud-config
+
+coreos:
+    units:
+      - name: ec2-ssh-key.service
+        runtime: yes
+        content: |
+          [Unit]
+          Description=Sets SSH key from metadata
+
+          [Service]
+          Type=oneshot
+          StandardOutput=journal+console
+          ExecStart=/usr/share/oem/bin/gce-ssh-key
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/run b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/gce-ssh-key
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/run
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/gce-ssh-key
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1.ebuild
index d4bb019993..f212cc7651 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1.ebuild
@@ -15,10 +15,12 @@ IUSE=""
 # no source directory
 S="${WORKDIR}"
 
+RDEPEND="dev-lang/python"
+
 src_install() {
-	exeinto "/"
-	doexe ${FILESDIR}/run
+	into "/"
+	dobin ${FILESDIR}/gce-ssh-key
 
 	insinto "/"
-	doins ${FILESDIR}/oem-release
+	doins ${FILESDIR}/cloud-config.yml
 }