diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine-reboot-manager.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine-reboot-manager.service
index 68dc5a3257..ae661d7b1f 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine-reboot-manager.service
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine-reboot-manager.service
@@ -1,10 +1,7 @@
 [Unit]
-Description=Update Engine
-ConditionVirtualization=!container
+PartOf=update-engine.service
+Description=Update Engine Reboot Manager
 
 [Service]
 ExecStart=/usr/sbin/update_engine_reboot_manager
 Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service
index 21a844dcd4..81f65ef70a 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/files/update-engine.service
@@ -1,6 +1,9 @@
 [Unit]
 Description=Update Engine
 ConditionVirtualization=!container
+ConditionKernelCommandLine=!coreos.diskless
+ConditionKernelCommandLine=!coreos.statediskonly
+Wants=update-engine-reboot-manager.service
 
 [Service]
 Type=dbus