diff --git a/systemd/system/wpeframework-devicediagnostics.service b/systemd/system/wpeframework-devicediagnostics.service
new file mode 100644
index 0000000..acb1170
--- /dev/null
+++ b/systemd/system/wpeframework-devicediagnostics.service
@@ -0,0 +1,10 @@
+
+[Unit]
+Description=WPE DeviceDiagnostics
+Requires=wpeframework.service
+After=wpeframework.service
+ConditionPathExists=/tmp/wpeframeworkstarted
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/PluginActivator org.rdk.DeviceDiagnostics
\ No newline at end of file