diff --git a/units/configdrive-block.service b/units/configdrive-block.service
index 1d5dc94..873fd73 100644
--- a/units/configdrive-block.service
+++ b/units/configdrive-block.service
@@ -5,10 +5,6 @@ ConditionPathIsMountPoint=!/media/configdrive
 # Only mount config drive block devices automatically in virtual machines
 ConditionVirtualization=vm
 
-# OpenStack defined config drive so they get to stick their name in it
-Wants=user-cloudinit@media-configdrive-openstack-latest-user_data.service
-Before=user-cloudinit@media-configdrive-openstack-latest-user_data.service
-
 [Service]
 Type=oneshot
 RemainAfterExit=no
diff --git a/units/configdrive-virtfs.service b/units/configdrive-virtfs.service
index 1654c24..bc29612 100644
--- a/units/configdrive-virtfs.service
+++ b/units/configdrive-virtfs.service
@@ -4,10 +4,6 @@ Conflicts=configdrive-block.service umount.target
 ConditionPathIsMountPoint=!/media/configdrive
 ConditionVirtualization=vm
 
-# OpenStack defined config drive so they get to stick their name in it
-Wants=user-cloudinit@media-configdrive-openstack-latest-user_data.service
-Before=user-cloudinit@media-configdrive-openstack-latest-user_data.service
-
 # Support old style setup for now
 Wants=addon-run@media-configdrive.service addon-config@media-configdrive.service
 Before=addon-run@media-configdrive.service addon-config@media-configdrive.service
diff --git a/units/user-cloudinit@.path b/units/user-cloudinit@.path
new file mode 100644
index 0000000..8a3ba0f
--- /dev/null
+++ b/units/user-cloudinit@.path
@@ -0,0 +1,5 @@
+[Unit]
+Description=Watch for a cloud-config at %f
+
+[Path]
+PathExists=%f
diff --git a/units/user-config.target b/units/user-config.target
index 018b47d..dae7d05 100644
--- a/units/user-config.target
+++ b/units/user-config.target
@@ -3,9 +3,11 @@ Description=Load user-provided cloud configs
 Requires=system-config.target
 After=system-config.target
 
-# Load user_data placed by coreos-install
-Requires=user-cloudinit@var-lib-coreos\x2dinstall-user_data.service
-After=user-cloudinit@var-lib-coreos\x2dinstall-user_data.service
+# Watch for configs at a couple common paths
+Requires=user-cloudinit@media-configdrive-openstack-latest-user_data.path
+After=user-cloudinit@media-configdrive-openstack-latest-user_data.path
+Requires=user-cloudinit@var-lib-coreos\x2dinstall-user_data.path
+After=user-cloudinit@var-lib-coreos\x2dinstall-user_data.path
 
 Requires=user-cloudinit-proc-cmdline.service
 After=user-cloudinit-proc-cmdline.service