diff --git a/systemd/system/wpeframework-ocdm.service b/systemd/system/wpeframework-ocdm.service
index 2261dcf..5c06abd 100644
--- a/systemd/system/wpeframework-ocdm.service
+++ b/systemd/system/wpeframework-ocdm.service
@@ -1,9 +1,13 @@
 [Unit]
-Description=WPEFramework OCDM Initialiser
+Description=WPEFramework OCDM Plugin
 Requires=wpeframework.service
-After=wpeframework.service
-ConditionPathExists=/tmp/wpeframeworkstarted
+After=wpeframework.service wpeframework-provisioning-ready.target
+Requisite=wpeframework-provisioning-ready.target
+
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/bin/PluginActivator -r 200 OCDM
+ExecStart=/usr/bin/PluginActivator OCDM
+
+[Install]
+WantedBy=wpeframework-provisioning-ready.target
diff --git a/systemd/system/wpeframework-provisioning-ready.path b/systemd/system/wpeframework-provisioning-ready.path
new file mode 100644
index 0000000..1afbbeb
--- /dev/null
+++ b/systemd/system/wpeframework-provisioning-ready.path
@@ -0,0 +1,12 @@
+[Unit]
+Description=Wait for Thunder PROVISIONING precondition
+Documentation=Thunder framework provisioning precondition fulfilled
+After=wpeframework-deviceprovisioning.service
+
+[Path]
+PathExists=/tmp/thunder-provisioning-precondition
+Unit=wpeframework-provisioning-ready.target
+MakeDirectory=false
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/systemd/system/wpeframework-provisioning-ready.target b/systemd/system/wpeframework-provisioning-ready.target
new file mode 100644
index 0000000..2016e03
--- /dev/null
+++ b/systemd/system/wpeframework-provisioning-ready.target
@@ -0,0 +1,5 @@
+[Unit]
+Description=Thunder Provisioning Completed
+Documentation=Indicates that Thunder PROVISIONING precondition has been fulfilled
+RefuseManualStart=yes
+RefuseManualStop=yes
\ No newline at end of file