diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/google-startup-scripts-1.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/google-startup-scripts-1.1.1-r1.ebuild
similarity index 87%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/google-startup-scripts-1.1.1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/google-startup-scripts-1.1.1-r1.ebuild
index 2036649778..a093a74c72 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/google-startup-scripts-1.1.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/google-startup-scripts-1.1.1-r1.ebuild
@@ -26,4 +26,6 @@ src_prepare() {
 src_install() {
 	mkdir -p ${D}/usr/share/oem/google-startup-scripts/usr/share/google/
 	cp -Ra ${WORKDIR}/usr/share/google/. ${D}/usr/share/oem/google-startup-scripts/ || die
+	# We don't install python or gsutil so skip this
+	rm -R ${D}/usr/share/oem/google-startup-scripts/boto || die
 }
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 5ff734bf36..8134814cef 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
@@ -76,14 +76,17 @@ coreos:
 
           [Install]
           WantedBy=multi-user.target
-      - name: google-startup-scripts.service
+      - name: google-startup-scripts-onboot.service
         command: start
         runtime: yes
         content: |
           [Unit]
           Description=Google Compute Engine Startup Scripts
           After=network.target
+          After=local-fs.target
+          Before=sshd.service
           Requires=network.target
+          Requires=local-fs.target
 
           [Service]
           Type=oneshot
@@ -92,6 +95,24 @@ coreos:
 
           [Install]
           WantedBy=multi-user.target
+      - name: google-startup-scripts.service
+        command: start
+        runtime: yes
+        content: |
+          [Unit]
+          Description=Google Compute Engine user startup scripts
+          After=network.target
+          After=google-startup-scripts-onboot.service
+          Requires=google-startup-scripts-onboot.service
+          Requires=network.target
+
+          [Service]
+          ExecStart=/usr/share/oem/google-startup-scripts/run-startup-scripts
+          Type=idle
+
+          [Install]
+          WantedBy=multi-user.target
+
     oem:
       id: gce
       name: Google Compute Engine
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r4.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r4.ebuild