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 17890ae0f6..7d28afa66f 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
@@ -13,7 +13,11 @@ coreos:
       - name: coreos-cloudinit-vagrant.service
         runtime: no
         content: |
+          [Unit]
+          ConditionFileNotEmpty=/var/lib/coreos-vagrant/user-data
+
           [Service]
           Type=oneshot
           EnvironmentFile=/etc/environment
           ExecStart=/usr/bin/coreos-cloudinit --from-file /var/lib/coreos-vagrant/user-data
+          RemainAfterExit=yes