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 8134814cef..7b274eec54 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
@@ -16,24 +16,13 @@ coreos:
         runtime: yes
         content: |
           [Unit]
-          Requires=gce-setup-environment.service
-          After=gce-setup-environment.service
+          Requires=coreos-setup-environment.service
+          After=coreos-setup-environment.service
 
           [Service]
           Type=oneshot
           EnvironmentFile=/etc/environment
           ExecStart=/usr/share/oem/bin/gce-coreos-cloudinit
-      - name: gce-setup-environment.service
-        command: restart
-        runtime: yes
-        content: |
-          [Unit]
-          Description=Setup environment variables from metadata
-
-          [Service]
-          Type=oneshot
-          StandardOutput=journal+console
-          ExecStart=/usr/share/oem/bin/gce-setup-environment /etc/environment
       - name: gce-ssh-key.service
         command: restart
         runtime: yes
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/gce-setup-environment b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/coreos-setup-environment
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/gce-setup-environment
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/coreos-setup-environment
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r8.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r7.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r8.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2.ebuild
index 5144c475f1..34642657aa 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2.ebuild
@@ -24,8 +24,8 @@ src_install() {
 	into "/usr/share/oem"
 	dobin ${FILESDIR}/gce-ssh-key
 	dobin ${FILESDIR}/gce-coreos-cloudinit
-	dobin ${FILESDIR}/gce-setup-environment
 	dobin ${FILESDIR}/gce-add-metadata-host
+	dobin ${FILESDIR}/coreos-setup-environment
 
 	insinto "/usr/share/oem"
 	doins ${FILESDIR}/cloud-config.yml