diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml
index 7c7e1a8878..bb5756c948 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml
@@ -3,6 +3,7 @@
 coreos:
     units:
       - name: ec2-ssh-key.service
+        command: restart
         runtime: yes
         content: |
           [Unit]
@@ -13,6 +14,7 @@ coreos:
           StandardOutput=journal+console
           ExecStart=/usr/share/oem/bin/ec2-ssh-key
       - name: ec2-cloudinit.service
+        command: restart
         runtime: yes
         content: |
           [Unit]
@@ -25,6 +27,7 @@ coreos:
           EnvironmentFile=/etc/environment
           ExecStart=/usr/bin/coreos-cloudinit -ignore-failure=true -from-url=http://169.254.169.254/latest/user-data
       - name: ec2-c10n.service
+        command: restart
         runtime: yes
         content: |
           [Unit]
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r10.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r11.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r10.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r11.ebuild
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 f2eca19ca5..771147b960 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
@@ -3,6 +3,7 @@
 coreos:
     units:
       - name: gce-coreos-cloudinit.service
+        command: restart
         runtime: yes
         content: |
           [Unit]
@@ -13,6 +14,7 @@ coreos:
           EnvironmentFile=/etc/environment
           ExecStart=/usr/share/oem/bin/gce-coreos-cloudinit
       - name: gce-setup-environment.service
+        command: restart
         runtime: yes
         content: |
           [Unit]
@@ -23,6 +25,7 @@ coreos:
           StandardOutput=journal+console
           ExecStart=/usr/share/oem/bin/gce-setup-environment /etc/environment
       - name: gce-ssh-key.service
+        command: restart
         runtime: yes
         content: |
           [Unit]
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1-r1.ebuild
new file mode 120000
index 0000000000..aed2a55f1d
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1-r1.ebuild
@@ -0,0 +1 @@
+oem-gce-0.0.1.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml
index 9616e04d03..6ffe801ed4 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml
@@ -3,6 +3,8 @@
 coreos:
     units:
       - name: nova-agent-auto.service
+        command: restart
+        runtime: yes
         content: |
           [Unit]
           After=dbus.service
@@ -18,6 +20,8 @@ coreos:
           ExecStopPost=/bin/umount -f /usr/share/oem/nova-agent/proc/xen
           ExecStopPost=/bin/umount -f /usr/share/oem/nova-agent/proc
       - name: nova-agent-watcher.service
+        command: restart
+        runtime: yes
         content: |
           [Unit]
           After=dbus.service
@@ -25,11 +29,15 @@ coreos:
           [Service]
           ExecStart=/usr/share/oem/usr/bin/nova-agent-watcher -watch-dir=/usr/share/oem/nova-agent -scripts-dir=/usr/share/oem/usr/bin/
       - name: media-configdrive.mount
+        command: restart
+        runtime: yes
         content: |
           [Mount]
           What=/dev/disk/by-label/config-2
           Where=/media/configdrive
       - name: cloudinit-configdrive.service
+        command: restart
+        runtime: yes
         content: |
           [Unit]
           RequiresMountsFor=/media/configdrive
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r3.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r3.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml
index 39d1a58463..17890ae0f6 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml
@@ -11,7 +11,6 @@ coreos:
           [Install]
           WantedBy=multi-user.target
       - name: coreos-cloudinit-vagrant.service
-        command: stop
         runtime: no
         content: |
           [Service]
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r3.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r3.ebuild