diff --git a/systemd/system/wpeframework-displaysettings.service b/systemd/system/wpeframework-displaysettings.service
index 5a0d379..567b028 100644
--- a/systemd/system/wpeframework-displaysettings.service
+++ b/systemd/system/wpeframework-displaysettings.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=WPEFramework DisplaySettings Initialiser
-Requires=dsmgr.service wpeframework-powermanager.service
-After=dsmgr.service wpeframework-powermanager.service
+Requires=dsmgr.service pqserver.service wpeframework-hdmicecsink.service wpeframework.service
+After=dsmgr.service pqserver.service wpeframework-hdmicecsink.service wpeframework.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
diff --git a/systemd/system/wpeframework-frontpanel.service b/systemd/system/wpeframework-frontpanel.service
index 60fd06e..e55d23c 100644
--- a/systemd/system/wpeframework-frontpanel.service
+++ b/systemd/system/wpeframework-frontpanel.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=WPEFramework FrontPanel Initialiser
-Requires=wpeframework-powermanager.service dsmgr.service
-After=wpeframework-powermanager.service dsmgr.service
+Requires=wpeframework.service dsmgr.service
+After=wpeframework.service dsmgr.service
 ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
diff --git a/systemd/system/wpeframework-hdcpprofile.service b/systemd/system/wpeframework-hdcpprofile.service
index f474d88..d5c9eb3 100644
--- a/systemd/system/wpeframework-hdcpprofile.service
+++ b/systemd/system/wpeframework-hdcpprofile.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=WPEFramework HdcpProfile Initialiser
-Requires=wpeframework-powermanager.service dsmgr.service
-After=wpeframework-powermanager.service dsmgr.service
+Requires=wpeframework.service dsmgr.service
+After=wpeframework.service dsmgr.service
 ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
diff --git a/systemd/system/wpeframework-hdmicecsink.service b/systemd/system/wpeframework-hdmicecsink.service
index f8edeee..acbae52 100644
--- a/systemd/system/wpeframework-hdmicecsink.service
+++ b/systemd/system/wpeframework-hdmicecsink.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=WPEFramework HdmiCecSink Initialiser
-Requires=dsmgr.service wpeframework-powermanager.service wpeframework-usersettings.service
-After=dsmgr.service wpeframework-powermanager.service wpeframework-usersettings.service
+Requires=dsmgr.service wpeframework.service wpeframework-usersettings.service
+After=dsmgr.service wpeframework.service wpeframework-usersettings.service
 ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
diff --git a/systemd/system/wpeframework-hdmicecsource.service b/systemd/system/wpeframework-hdmicecsource.service
index ed4d8e1..ed6988f 100644
--- a/systemd/system/wpeframework-hdmicecsource.service
+++ b/systemd/system/wpeframework-hdmicecsource.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=WPEFramework HdmiCecSource Initialiser
 Requires=wpeframework.service
-After=wpeframework-powermanager.service dsmgr.service
+After=wpeframework.service dsmgr.service
 ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
diff --git a/systemd/system/wpeframework-powermanager.service b/systemd/system/wpeframework-powermanager.service
deleted file mode 100755
index 01feedc..0000000
--- a/systemd/system/wpeframework-powermanager.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=WPEFramework PowerManager Initialiser
-Requires=wpeframework.service iarmbusd.service
-After=wpeframework.service iarmbusd.service 
-ConditionPathExists=/tmp/wpeframeworkstarted
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/PluginActivator org.rdk.PowerManager
-ExecStop=/bin/touch /tmp/pwrmgr_restarted
-[Install]
-WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-system.service b/systemd/system/wpeframework-system.service
index f5aea8c..6080b58 100644
--- a/systemd/system/wpeframework-system.service
+++ b/systemd/system/wpeframework-system.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=WPEFramework System Initialiser
-Requires=wpeframework-powermanager.service sysmgr.service mfrmgr.service
-After=wpeframework-powermanager.service sysmgr.service mfrmgr.service
+Requires=wpeframework.service sysmgr.service mfrmgr.service
+After=wpeframework.service sysmgr.service mfrmgr.service
 ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
diff --git a/systemd/system/wpeframework-telemetry.service b/systemd/system/wpeframework-telemetry.service
index 307ee73..2ef728d 100644
--- a/systemd/system/wpeframework-telemetry.service
+++ b/systemd/system/wpeframework-telemetry.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=WPEFramework Telemetry Initialiser
-Requires=wpeframework-system.service wpeframework-powermanager.service wpeframework-usersettings.service
-After=wpeframework-system.service wpeframework-powermanager.service wpeframework-usersettings.service
+Requires=wpeframework-system.service wpeframework.service wpeframework-usersettings.service
+After=wpeframework-system.service wpeframework.service wpeframework-usersettings.service
 ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
diff --git a/systemd/system/wpeframework-xcast.service b/systemd/system/wpeframework-xcast.service
index 7be90b2..7c53090 100644
--- a/systemd/system/wpeframework-xcast.service
+++ b/systemd/system/wpeframework-xcast.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=WPEFramework Xcast Initialiser
-Requires=wpeframework-powermanager.service
-After=wpeframework-powermanager.service
+Requires=wpeframework.service
+After=wpeframework.service
 ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot