From c4c83e2b76ac7f6bc0bc718ccc56a16f78983811 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 5 Feb 2026 20:04:28 +0000
Subject: [PATCH 1/3] Initial plan


From 11fe63a00c3f86f3873bb8e91650919c05cb47f2 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 5 Feb 2026 20:07:40 +0000
Subject: [PATCH 2/3] Add timeout directives, [Install] sections, PrivateTmp,
 and documentation to all 52 systemd service files

Co-authored-by: anand-ky <37086488+anand-ky@users.noreply.github.com>
---
 systemd/system/wpeframework-analytics.service |  8 +++++
 .../system/wpeframework-appgateway.service    |  8 +++++
 .../wpeframework-appgatewaycommon.service     |  8 +++++
 .../system/wpeframework-appmanager.service    | 31 ++++++++++++-------
 .../wpeframework-appnotifications.service     |  8 +++++
 systemd/system/wpeframework-avinput.service   |  8 +++++
 systemd/system/wpeframework-avoutput.service  |  8 +++++
 systemd/system/wpeframework-bluetooth.service | 10 +++++-
 .../system/wpeframework-cloudstore.service    |  8 +++++
 .../system/wpeframework-cryptography.service  |  8 +++++
 .../system/wpeframework-deviceinfo.service    |  8 +++++
 .../system/wpeframework-displayinfo.service   |  8 +++++
 .../wpeframework-displaysettings.service      | 13 ++++++--
 .../wpeframework-downloadmanager.service      |  7 +++++
 .../wpeframework-firmwareupdate.service       |  8 +++++
 .../system/wpeframework-frontpanel.service    |  8 +++++
 .../system/wpeframework-hdcpprofile.service   |  8 +++++
 .../system/wpeframework-hdmicecsink.service   |  8 +++++
 .../system/wpeframework-hdmicecsource.service | 11 ++++++-
 .../wpeframework-lifecyclemanager.service     | 31 ++++++++++++-------
 systemd/system/wpeframework-lisa.service      |  8 +++++
 .../system/wpeframework-locationsync.service  |  8 +++++
 .../wpeframework-maintenancemanager.service   |  8 +++++
 systemd/system/wpeframework-messenger.service |  8 +++++
 systemd/system/wpeframework-migration.service |  8 +++++
 systemd/system/wpeframework-monitor.service   |  8 +++++
 systemd/system/wpeframework-network.service   |  8 +++++
 .../wpeframework-networkmanager.service       |  8 +++++
 systemd/system/wpeframework-ocdm.service      |  9 ++++++
 .../system/wpeframework-ocicontainer.service  |  8 +++++
 .../wpeframework-packagemanager.service       |  7 +++++
 .../wpeframework-persistentstore.service      |  8 +++++
 .../system/wpeframework-playerinfo.service    |  8 +++++
 .../system/wpeframework-powermanager.service  |  7 ++++-
 .../wpeframework-preinstallmanager.service    | 30 +++++++++++-------
 systemd/system/wpeframework-rdkshell.service  |  8 +++++
 .../wpeframework-rdkwindowmanager.service     |  7 +++++
 .../system/wpeframework-remotecontrol.service |  8 +++++
 .../wpeframework-runtimemanager.service       | 31 ++++++++++++-------
 .../system/wpeframework-sharedstorage.service |  8 +++++
 .../wpeframework-storagemanager.service       | 31 ++++++++++++-------
 systemd/system/wpeframework-system.service    |  8 +++++
 .../wpeframework-systemaudioplayer.service    |  8 +++++
 .../system/wpeframework-systemmode.service    |  8 +++++
 systemd/system/wpeframework-telemetry.service |  8 +++++
 .../system/wpeframework-texttospeech.service  |  8 +++++
 systemd/system/wpeframework-usbdevice.service |  8 +++++
 .../wpeframework-usbmassstorage.service       |  8 +++++
 .../system/wpeframework-usersettings.service  |  8 +++++
 .../system/wpeframework-voicecontrol.service  |  8 +++++
 systemd/system/wpeframework-wifi.service      |  8 +++++
 systemd/system/wpeframework-xcast.service     |  8 +++++
 52 files changed, 473 insertions(+), 64 deletions(-)

diff --git a/systemd/system/wpeframework-analytics.service b/systemd/system/wpeframework-analytics.service
index 8fa49d0..8101094 100644
--- a/systemd/system/wpeframework-analytics.service
+++ b/systemd/system/wpeframework-analytics.service
@@ -1,3 +1,5 @@
+# WPEFramework Analytics Initialiser
+# Activates the Analytics plugin after framework initialization
 [Unit]
 Description=WPEFramework Analytics Initialiser
 Requires=wpeframework.service wpeframework-persistentstore.service wpeframework-system.service wpeframework-deviceinfo.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.Analytics
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-appgateway.service b/systemd/system/wpeframework-appgateway.service
index 99c58d9..abd363e 100644
--- a/systemd/system/wpeframework-appgateway.service
+++ b/systemd/system/wpeframework-appgateway.service
@@ -1,3 +1,5 @@
+# WPEFramework AppGateway Initialiser
+# Activates the AppGateway plugin after framework initialization
 [Unit]
 Description=WPEFramework AppGateway Initialiser
 Requires=wpeframework.service wpeframework-appnotifications.service
@@ -8,4 +10,10 @@ ConditionPathExists=/opt/appgatewayenabled
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.AppGateway
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-appgatewaycommon.service b/systemd/system/wpeframework-appgatewaycommon.service
index 06b6d98..55d635e 100644
--- a/systemd/system/wpeframework-appgatewaycommon.service
+++ b/systemd/system/wpeframework-appgatewaycommon.service
@@ -1,3 +1,5 @@
+# WPEFramework AppGatewayCommon Initialiser
+# Activates the AppGatewayCommon plugin after framework initialization
 [Unit]
 Description=WPEFramework AppGatewayCommon Initialiser
 Requires=wpeframework.service wpeframework-appgateway.service
@@ -8,4 +10,10 @@ ConditionPathExists=/opt/appgatewayenabled
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.AppGatewayCommon
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-appmanager.service b/systemd/system/wpeframework-appmanager.service
index 597b20e..7646f68 100644
--- a/systemd/system/wpeframework-appmanager.service
+++ b/systemd/system/wpeframework-appmanager.service
@@ -1,12 +1,19 @@
-[Unit]
-Description=WPEFramework AppManager Initialiser
-Requires= wpeframework.service wpeframework-lifecyclemanager.service wpeframework-persistentstore.service wpeframework-packagemanager.service
-After= wpeframework.service wpeframework-lifecyclemanager.service wpeframework-persistentstore.service wpeframework-packagemanager.service
-ConditionPathExists=/opt/ai2managers
-ConditionPathExists=/tmp/wpeframeworkstarted
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/PluginActivator org.rdk.AppManager
-
+# WPEFramework AppManager Initialiser
+# Activates the AppManager plugin after framework initialization
+[Unit]
+Description=WPEFramework AppManager Initialiser
+Requires= wpeframework.service wpeframework-lifecyclemanager.service wpeframework-persistentstore.service wpeframework-packagemanager.service
+After= wpeframework.service wpeframework-lifecyclemanager.service wpeframework-persistentstore.service wpeframework-packagemanager.service
+ConditionPathExists=/opt/ai2managers
+ConditionPathExists=/tmp/wpeframeworkstarted
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
+ExecStart=/usr/bin/PluginActivator org.rdk.AppManager
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-appnotifications.service b/systemd/system/wpeframework-appnotifications.service
index 9e50cec..47aadff 100644
--- a/systemd/system/wpeframework-appnotifications.service
+++ b/systemd/system/wpeframework-appnotifications.service
@@ -1,3 +1,5 @@
+# WPEFramework AppNotifications Initialiser
+# Activates the AppNotifications plugin after framework initialization
 [Unit]
 Description=WPEFramework AppNotifications Initialiser
 Requires=wpeframework.service
@@ -8,4 +10,10 @@ ConditionPathExists=/opt/appgatewayenabled
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.AppNotifications
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-avinput.service b/systemd/system/wpeframework-avinput.service
index 4aa43c5..bef1c31 100644
--- a/systemd/system/wpeframework-avinput.service
+++ b/systemd/system/wpeframework-avinput.service
@@ -1,3 +1,5 @@
+# WPEFramework AVInput Initialiser
+# Activates the AVInput plugin after framework initialization
 [Unit]
 Description=WPEFramework AVInput Initialiser
 Requires=wpeframework.service dsmgr.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.AVInput
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-avoutput.service b/systemd/system/wpeframework-avoutput.service
index f625c2e..bec3030 100644
--- a/systemd/system/wpeframework-avoutput.service
+++ b/systemd/system/wpeframework-avoutput.service
@@ -1,3 +1,5 @@
+# WPEFramework AVOutput Initialiser
+# Activates the AVOutput plugin after framework initialization
 [Unit]
 Description=WPEFramework AVOutput Initialiser
 Requires=wpeframework.service dsmgr.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.AVOutput
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-bluetooth.service b/systemd/system/wpeframework-bluetooth.service
index ae6c9dc..381f7d1 100644
--- a/systemd/system/wpeframework-bluetooth.service
+++ b/systemd/system/wpeframework-bluetooth.service
@@ -1,9 +1,17 @@
+# WPEFramework Bluetooth Initialiser
+# Activates the Bluetooth plugin after framework initialization
 [Unit]
 Description=WPEFramework Bluetooth Initialiser
-Requires=wpeframework.service iarmbusd.service bluetooth.service
+Requires=wpeframework.service iarmbusd.service btmgr.service
 After=wpeframework.service iarmbusd.service btmgr.service
 ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.Bluetooth
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-cloudstore.service b/systemd/system/wpeframework-cloudstore.service
index d6fc54e..7071789 100644
--- a/systemd/system/wpeframework-cloudstore.service
+++ b/systemd/system/wpeframework-cloudstore.service
@@ -1,3 +1,5 @@
+# WPEFramework CloudStore Initialiser
+# Activates the CloudStore plugin after framework initialization
 [Unit]
 Description=WPEFramework CloudStore Initialiser
 Requires=wpeframework.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.CloudStore
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-cryptography.service b/systemd/system/wpeframework-cryptography.service
index 0f9df25..a7c0ddb 100644
--- a/systemd/system/wpeframework-cryptography.service
+++ b/systemd/system/wpeframework-cryptography.service
@@ -1,3 +1,5 @@
+# WPEFramework Cryptography Initialiser
+# Activates the Cryptography plugin after framework initialization
 [Unit]
 Description=WPEFramework Cryptography Initialiser
 Requires=wpeframework.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.Cryptography
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-deviceinfo.service b/systemd/system/wpeframework-deviceinfo.service
index 4ec186a..91b0153 100644
--- a/systemd/system/wpeframework-deviceinfo.service
+++ b/systemd/system/wpeframework-deviceinfo.service
@@ -1,3 +1,5 @@
+# WPEFramework DeviceInfo Initialiser
+# Activates the DeviceInfo plugin after framework initialization
 [Unit]
 Description=WPEFramework DeviceInfo Initialiser
 Requires=wpeframework.service iarmbusd.service dsmgr.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator DeviceInfo
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-displayinfo.service b/systemd/system/wpeframework-displayinfo.service
index 5128959..c040a8c 100644
--- a/systemd/system/wpeframework-displayinfo.service
+++ b/systemd/system/wpeframework-displayinfo.service
@@ -1,3 +1,5 @@
+# WPEFramework DisplayInfo Initialiser
+# Activates the DisplayInfo plugin after framework initialization
 [Unit]
 Description=WPEFramework DisplayInfo Initialiser
 Requires=wpeframework.service iarmbusd.service dsmgr.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator DisplayInfo
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-displaysettings.service b/systemd/system/wpeframework-displaysettings.service
index 5a0d379..7b6a513 100644
--- a/systemd/system/wpeframework-displaysettings.service
+++ b/systemd/system/wpeframework-displaysettings.service
@@ -1,8 +1,17 @@
+# WPEFramework DisplaySettings Initialiser
+# Activates the DisplaySettings plugin after framework initialization
 [Unit]
 Description=WPEFramework DisplaySettings Initialiser
-Requires=dsmgr.service wpeframework-powermanager.service
-After=dsmgr.service wpeframework-powermanager.service
+Requires=wpeframework.service dsmgr.service wpeframework-powermanager.service
+After=wpeframework.service dsmgr.service wpeframework-powermanager.service
+ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.DisplaySettings
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-downloadmanager.service b/systemd/system/wpeframework-downloadmanager.service
index 8b62791..dce7b48 100755
--- a/systemd/system/wpeframework-downloadmanager.service
+++ b/systemd/system/wpeframework-downloadmanager.service
@@ -1,3 +1,5 @@
+# WPEFramework DownloadManager Initialiser
+# Activates the DownloadManager plugin after framework initialization
 [Unit]
 Description=WPEFramework DownloadManager Initialiser
 Requires= wpeframework.service wpeframework-storagemanager.service
@@ -8,5 +10,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.DownloadManager
 
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-firmwareupdate.service b/systemd/system/wpeframework-firmwareupdate.service
index 75ed301..4a67691 100644
--- a/systemd/system/wpeframework-firmwareupdate.service
+++ b/systemd/system/wpeframework-firmwareupdate.service
@@ -1,3 +1,5 @@
+# WPEFramework FirmwareUpdate Initialiser
+# Activates the FirmwareUpdate plugin after framework initialization
 [Unit]
 Description=WPEFramework FirmwareUpdate Initialiser
 Requires=wpeframework.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.FirmwareUpdate
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-frontpanel.service b/systemd/system/wpeframework-frontpanel.service
index 60fd06e..cbdf4d8 100644
--- a/systemd/system/wpeframework-frontpanel.service
+++ b/systemd/system/wpeframework-frontpanel.service
@@ -1,3 +1,5 @@
+# WPEFramework FrontPanel Initialiser
+# Activates the FrontPanel plugin after framework initialization
 [Unit]
 Description=WPEFramework FrontPanel Initialiser
 Requires=wpeframework-powermanager.service dsmgr.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.FrontPanel
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-hdcpprofile.service b/systemd/system/wpeframework-hdcpprofile.service
index f474d88..1f3121c 100644
--- a/systemd/system/wpeframework-hdcpprofile.service
+++ b/systemd/system/wpeframework-hdcpprofile.service
@@ -1,3 +1,5 @@
+# WPEFramework HdcpProfile Initialiser
+# Activates the HdcpProfile plugin after framework initialization
 [Unit]
 Description=WPEFramework HdcpProfile Initialiser
 Requires=wpeframework-powermanager.service dsmgr.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.HdcpProfile
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-hdmicecsink.service b/systemd/system/wpeframework-hdmicecsink.service
index f8edeee..4fcb8b1 100644
--- a/systemd/system/wpeframework-hdmicecsink.service
+++ b/systemd/system/wpeframework-hdmicecsink.service
@@ -1,3 +1,5 @@
+# WPEFramework HdmiCecSink Initialiser
+# Activates the HdmiCecSink plugin after framework initialization
 [Unit]
 Description=WPEFramework HdmiCecSink Initialiser
 Requires=dsmgr.service wpeframework-powermanager.service wpeframework-usersettings.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.HdmiCecSink
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-hdmicecsource.service b/systemd/system/wpeframework-hdmicecsource.service
index ed4d8e1..abf0064 100644
--- a/systemd/system/wpeframework-hdmicecsource.service
+++ b/systemd/system/wpeframework-hdmicecsource.service
@@ -1,9 +1,18 @@
+# WPEFramework HdmiCecSource Initialiser
+# Activates the HdmiCecSource plugin after framework initialization
 [Unit]
 Description=WPEFramework HdmiCecSource Initialiser
 Requires=wpeframework.service
-After=wpeframework-powermanager.service dsmgr.service
+Wants=wpeframework-powermanager.service dsmgr.service
+After=wpeframework.service wpeframework-powermanager.service dsmgr.service
 ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.HdmiCecSource
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-lifecyclemanager.service b/systemd/system/wpeframework-lifecyclemanager.service
index 623b67c..7c827b4 100755
--- a/systemd/system/wpeframework-lifecyclemanager.service
+++ b/systemd/system/wpeframework-lifecyclemanager.service
@@ -1,12 +1,19 @@
-[Unit]
-Description=WPEFramework LifecycleManager Initialiser
-Requires= wpeframework.service wpeframework-runtimemanager.service
-After= wpeframework.service wpeframework-runtimemanager.service
-ConditionPathExists=/opt/ai2managers
-ConditionPathExists=/tmp/wpeframeworkstarted
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/PluginActivator org.rdk.LifecycleManager
-
+# WPEFramework LifecycleManager Initialiser
+# Activates the LifecycleManager plugin after framework initialization
+[Unit]
+Description=WPEFramework LifecycleManager Initialiser
+Requires= wpeframework.service wpeframework-runtimemanager.service
+After= wpeframework.service wpeframework-runtimemanager.service
+ConditionPathExists=/opt/ai2managers
+ConditionPathExists=/tmp/wpeframeworkstarted
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
+ExecStart=/usr/bin/PluginActivator org.rdk.LifecycleManager
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-lisa.service b/systemd/system/wpeframework-lisa.service
index bf8c85a..efe9f65 100644
--- a/systemd/system/wpeframework-lisa.service
+++ b/systemd/system/wpeframework-lisa.service
@@ -1,3 +1,5 @@
+# WPEFramework Plugin Initialiser
+# Activates the Plugin plugin after framework initialization
 [Unit]
 Description=WPEFramework DAC LISA Plugin Initialiser
 Requires=wpeframework.service iarmbusd.service dsmgr.service
@@ -9,3 +11,9 @@ ConditionPathExists=!/opt/ai2managers
 Type=oneshot
 ExecStart=/usr/bin/PluginActivator LISA
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-locationsync.service b/systemd/system/wpeframework-locationsync.service
index 0bdbabb..9a56c06 100644
--- a/systemd/system/wpeframework-locationsync.service
+++ b/systemd/system/wpeframework-locationsync.service
@@ -1,3 +1,5 @@
+# WPEFramework LocationSync Initialiser
+# Activates the LocationSync plugin after framework initialization
 [Unit]
 Description=WPEFramework LocationSync Initialiser
 Requires=wpeframework.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator LocationSync
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-maintenancemanager.service b/systemd/system/wpeframework-maintenancemanager.service
index f004ea2..5c7d8a1 100644
--- a/systemd/system/wpeframework-maintenancemanager.service
+++ b/systemd/system/wpeframework-maintenancemanager.service
@@ -1,3 +1,5 @@
+# WPEFramework MaintenanceManager Initialiser
+# Activates the MaintenanceManager plugin after framework initialization
 [Unit]
 Description=WPEFramework MaintenanceManager Initialiser
 Requires=wpeframework.service iarmbusd.service mfrmgr.service wpeframework-network.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.MaintenanceManager
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-messenger.service b/systemd/system/wpeframework-messenger.service
index e5f6685..86fc855 100644
--- a/systemd/system/wpeframework-messenger.service
+++ b/systemd/system/wpeframework-messenger.service
@@ -1,3 +1,5 @@
+# WPEFramework Messenger Initialiser
+# Activates the Messenger plugin after framework initialization
 [Unit]
 Description=WPEFramework Messenger Initialiser
 Requires=wpeframework.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator Messenger
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-migration.service b/systemd/system/wpeframework-migration.service
index 1d77aac..152681b 100644
--- a/systemd/system/wpeframework-migration.service
+++ b/systemd/system/wpeframework-migration.service
@@ -1,3 +1,5 @@
+# WPEFramework Migration Initialiser
+# Activates the Migration plugin after framework initialization
 [Unit]
 Description=WPEFramework Migration Initialiser
 Requires=wpeframework.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.Migration
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-monitor.service b/systemd/system/wpeframework-monitor.service
index 959cf04..4909c5a 100644
--- a/systemd/system/wpeframework-monitor.service
+++ b/systemd/system/wpeframework-monitor.service
@@ -1,3 +1,5 @@
+# WPEFramework Monitor Initialiser
+# Activates the Monitor plugin after framework initialization
 [Unit]
 Description=WPEFramework Monitor Initialiser
 Requires=wpeframework.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator Monitor
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-network.service b/systemd/system/wpeframework-network.service
index 9d01f29..8cae3b9 100644
--- a/systemd/system/wpeframework-network.service
+++ b/systemd/system/wpeframework-network.service
@@ -1,3 +1,5 @@
+# WPEFramework Network Initialiser
+# Activates the Network plugin after framework initialization
 [Unit]
 Description=WPEFramework Network Initialiser
 Requires=wpeframework.service iarmbusd.service wpeframework-networkmanager.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.Network
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-networkmanager.service b/systemd/system/wpeframework-networkmanager.service
index 3301923..6040c3a 100644
--- a/systemd/system/wpeframework-networkmanager.service
+++ b/systemd/system/wpeframework-networkmanager.service
@@ -1,3 +1,5 @@
+# WPEFramework NetworkManager Initialiser
+# Activates the NetworkManager plugin after framework initialization
 [Unit]
 Description=WPEFramework NetworkManager Initialiser
 Requires=wpeframework.service iarmbusd.service NetworkManager.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.NetworkManager
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-ocdm.service b/systemd/system/wpeframework-ocdm.service
index 2261dcf..ce87d08 100644
--- a/systemd/system/wpeframework-ocdm.service
+++ b/systemd/system/wpeframework-ocdm.service
@@ -1,3 +1,5 @@
+# WPEFramework OCDM Initialiser
+# Activates the OCDM plugin after framework initialization
 [Unit]
 Description=WPEFramework OCDM Initialiser
 Requires=wpeframework.service
@@ -6,4 +8,11 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
+# -r 200: Retry activation up to 200 times before failing (for DRM module initialization)
 ExecStart=/usr/bin/PluginActivator -r 200 OCDM
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-ocicontainer.service b/systemd/system/wpeframework-ocicontainer.service
index 4ef535f..910457d 100644
--- a/systemd/system/wpeframework-ocicontainer.service
+++ b/systemd/system/wpeframework-ocicontainer.service
@@ -1,3 +1,5 @@
+# WPEFramework Plugin Initialiser
+# Activates the Plugin plugin after framework initialization
 [Unit]
 Description=WPEFramework OCIContainer Plugin Initialiser
 Requires=wpeframework.service iarmbusd.service dsmgr.service
@@ -8,3 +10,9 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 Type=oneshot
 ExecStart=/usr/bin/PluginActivator org.rdk.OCIContainer
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-packagemanager.service b/systemd/system/wpeframework-packagemanager.service
index fff8a89..542de78 100644
--- a/systemd/system/wpeframework-packagemanager.service
+++ b/systemd/system/wpeframework-packagemanager.service
@@ -1,3 +1,5 @@
+# WPEFramework PackageManagerRDKEMS Initialiser
+# Activates the PackageManagerRDKEMS plugin after framework initialization
 [Unit]
 Description=WPEFramework PackageManagerRDKEMS Initialiser
 Requires= wpeframework.service wpeframework-storagemanager.service
@@ -8,5 +10,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.PackageManagerRDKEMS
 
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-persistentstore.service b/systemd/system/wpeframework-persistentstore.service
index e1892b6..04f3f64 100644
--- a/systemd/system/wpeframework-persistentstore.service
+++ b/systemd/system/wpeframework-persistentstore.service
@@ -1,3 +1,5 @@
+# WPEFramework PersistentStore Initialiser
+# Activates the PersistentStore plugin after framework initialization
 [Unit]
 Description=WPEFramework PersistentStore Initialiser
 Requires=wpeframework.service
@@ -7,4 +9,10 @@ RequiresMountsFor=/opt/secure
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.PersistentStore
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-playerinfo.service b/systemd/system/wpeframework-playerinfo.service
index dedacf0..d04d99a 100644
--- a/systemd/system/wpeframework-playerinfo.service
+++ b/systemd/system/wpeframework-playerinfo.service
@@ -1,3 +1,5 @@
+# WPEFramework PlayerInfo Initialiser
+# Activates the PlayerInfo plugin after framework initialization
 [Unit]
 Description=WPEFramework PlayerInfo Initialiser
 Requires=wpeframework.service iarmbusd.service dsmgr.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator PlayerInfo
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-powermanager.service b/systemd/system/wpeframework-powermanager.service
index 01feedc..1770afb 100755
--- a/systemd/system/wpeframework-powermanager.service
+++ b/systemd/system/wpeframework-powermanager.service
@@ -1,11 +1,16 @@
+# WPEFramework PowerManager Initialiser
+# Activates the PowerManager plugin after framework initialization
 [Unit]
 Description=WPEFramework PowerManager Initialiser
 Requires=wpeframework.service iarmbusd.service
-After=wpeframework.service iarmbusd.service 
+After=wpeframework.service iarmbusd.service
 ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.PowerManager
 ExecStop=/bin/touch /tmp/pwrmgr_restarted
 [Install]
diff --git a/systemd/system/wpeframework-preinstallmanager.service b/systemd/system/wpeframework-preinstallmanager.service
index 7548ba4..da0b502 100755
--- a/systemd/system/wpeframework-preinstallmanager.service
+++ b/systemd/system/wpeframework-preinstallmanager.service
@@ -1,11 +1,19 @@
-[Unit]
-Description=WPEFramework PreinstallManager Initialiser
-Requires= wpeframework.service wpeframework-packagemanager.service
-After= wpeframework.service wpeframework-packagemanager.service
-ConditionPathExists=/opt/ai2managers
-ConditionPathExists=/tmp/wpeframeworkstarted
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/PluginActivator org.rdk.PreinstallManager
+# WPEFramework PreinstallManager Initialiser
+# Activates the PreinstallManager plugin after framework initialization
+[Unit]
+Description=WPEFramework PreinstallManager Initialiser
+Requires= wpeframework.service wpeframework-packagemanager.service
+After= wpeframework.service wpeframework-packagemanager.service
+ConditionPathExists=/opt/ai2managers
+ConditionPathExists=/tmp/wpeframeworkstarted
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
+ExecStart=/usr/bin/PluginActivator org.rdk.PreinstallManager
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-rdkshell.service b/systemd/system/wpeframework-rdkshell.service
index 0215c3a..5fe76c4 100644
--- a/systemd/system/wpeframework-rdkshell.service
+++ b/systemd/system/wpeframework-rdkshell.service
@@ -1,3 +1,5 @@
+# WPEFramework Plugin Initialiser
+# Activates the Plugin plugin after framework initialization
 [Unit]
 Description=WPEFramework RDKShell Plugin Initialiser
 Requires=wpeframework.service iarmbusd.service dsmgr.service
@@ -9,3 +11,9 @@ ConditionPathExists=!/opt/ai2managers
 Type=oneshot
 ExecStart=/usr/bin/PluginActivator org.rdk.RDKShell
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-rdkwindowmanager.service b/systemd/system/wpeframework-rdkwindowmanager.service
index 66cc3ce..685d80f 100755
--- a/systemd/system/wpeframework-rdkwindowmanager.service
+++ b/systemd/system/wpeframework-rdkwindowmanager.service
@@ -1,3 +1,5 @@
+# WPEFramework RDKWindowManager Initialiser
+# Activates the RDKWindowManager plugin after framework initialization
 [Unit]
 Description=WPEFramework RDKWindowManager Initialiser
 Requires=wpeframework.service
@@ -8,5 +10,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.RDKWindowManager
 
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-remotecontrol.service b/systemd/system/wpeframework-remotecontrol.service
index f75b3e4..58ce268 100644
--- a/systemd/system/wpeframework-remotecontrol.service
+++ b/systemd/system/wpeframework-remotecontrol.service
@@ -1,3 +1,5 @@
+# WPEFramework RemoteControl Initialiser
+# Activates the RemoteControl plugin after framework initialization
 [Unit]
 Description=WPEFramework RemoteControl Initialiser
 Requires=wpeframework.service iarmbusd.service ctrlm-main.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.RemoteControl
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-runtimemanager.service b/systemd/system/wpeframework-runtimemanager.service
index 27d3550..6bac3fd 100755
--- a/systemd/system/wpeframework-runtimemanager.service
+++ b/systemd/system/wpeframework-runtimemanager.service
@@ -1,12 +1,19 @@
-[Unit]
-Description=WPEFramework RuntimeManager Initialiser
-Requires= wpeframework.service wpeframework-storagemanager.service wpeframework-rdkwindowmanager.service wpeframework-ocicontainer.service
-After= wpeframework.service wpeframework-storagemanager.service wpeframework-rdkwindowmanager.service wpeframework-ocicontainer.service
-ConditionPathExists=/opt/ai2managers
-ConditionPathExists=/tmp/wpeframeworkstarted
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/PluginActivator org.rdk.RuntimeManager
-
+# WPEFramework RuntimeManager Initialiser
+# Activates the RuntimeManager plugin after framework initialization
+[Unit]
+Description=WPEFramework RuntimeManager Initialiser
+Requires= wpeframework.service wpeframework-storagemanager.service wpeframework-rdkwindowmanager.service wpeframework-ocicontainer.service
+After= wpeframework.service wpeframework-storagemanager.service wpeframework-rdkwindowmanager.service wpeframework-ocicontainer.service
+ConditionPathExists=/opt/ai2managers
+ConditionPathExists=/tmp/wpeframeworkstarted
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
+ExecStart=/usr/bin/PluginActivator org.rdk.RuntimeManager
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-sharedstorage.service b/systemd/system/wpeframework-sharedstorage.service
index 1910a46..f03997e 100644
--- a/systemd/system/wpeframework-sharedstorage.service
+++ b/systemd/system/wpeframework-sharedstorage.service
@@ -1,3 +1,5 @@
+# WPEFramework SharedStorage Initialiser
+# Activates the SharedStorage plugin after framework initialization
 [Unit]
 Description=WPEFramework SharedStorage Initialiser
 Requires=wpeframework.service wpeframework-persistentstore.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.SharedStorage
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-storagemanager.service b/systemd/system/wpeframework-storagemanager.service
index 3c3937c..94b723d 100644
--- a/systemd/system/wpeframework-storagemanager.service
+++ b/systemd/system/wpeframework-storagemanager.service
@@ -1,12 +1,19 @@
-[Unit]
-Description=WPEFramework StorageManager Initialiser
-Requires= wpeframework.service
-After= wpeframework.service
-ConditionPathExists=/opt/ai2managers
-ConditionPathExists=/tmp/wpeframeworkstarted
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/PluginActivator org.rdk.StorageManager
-
+# WPEFramework StorageManager Initialiser
+# Activates the StorageManager plugin after framework initialization
+[Unit]
+Description=WPEFramework StorageManager Initialiser
+Requires= wpeframework.service
+After= wpeframework.service
+ConditionPathExists=/opt/ai2managers
+ConditionPathExists=/tmp/wpeframeworkstarted
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
+ExecStart=/usr/bin/PluginActivator org.rdk.StorageManager
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-system.service b/systemd/system/wpeframework-system.service
index f5aea8c..3182707 100644
--- a/systemd/system/wpeframework-system.service
+++ b/systemd/system/wpeframework-system.service
@@ -1,3 +1,5 @@
+# WPEFramework System Initialiser
+# Activates the System plugin after framework initialization
 [Unit]
 Description=WPEFramework System Initialiser
 Requires=wpeframework-powermanager.service sysmgr.service mfrmgr.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.System
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-systemaudioplayer.service b/systemd/system/wpeframework-systemaudioplayer.service
index 56ffc8c..3c8c550 100644
--- a/systemd/system/wpeframework-systemaudioplayer.service
+++ b/systemd/system/wpeframework-systemaudioplayer.service
@@ -1,3 +1,5 @@
+# WPEFramework SystemAudioPlayer Initialiser
+# Activates the SystemAudioPlayer plugin after framework initialization
 [Unit]
 Description=WPEFramework SystemAudioPlayer Initialiser
 Requires=wpeframework.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.SystemAudioPlayer
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-systemmode.service b/systemd/system/wpeframework-systemmode.service
index 9f1eb39..4313a52 100644
--- a/systemd/system/wpeframework-systemmode.service
+++ b/systemd/system/wpeframework-systemmode.service
@@ -1,3 +1,5 @@
+# WPEFramework SystemMode Initialiser
+# Activates the SystemMode plugin after framework initialization
 [Unit]
 Description=WPEFramework SystemMode Initialiser
 Requires=wpeframework.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.SystemMode
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-telemetry.service b/systemd/system/wpeframework-telemetry.service
index 307ee73..9830bcf 100644
--- a/systemd/system/wpeframework-telemetry.service
+++ b/systemd/system/wpeframework-telemetry.service
@@ -1,3 +1,5 @@
+# WPEFramework Telemetry Initialiser
+# Activates the Telemetry plugin after framework initialization
 [Unit]
 Description=WPEFramework Telemetry Initialiser
 Requires=wpeframework-system.service wpeframework-powermanager.service wpeframework-usersettings.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.Telemetry
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-texttospeech.service b/systemd/system/wpeframework-texttospeech.service
index 6348963..ce3f38f 100644
--- a/systemd/system/wpeframework-texttospeech.service
+++ b/systemd/system/wpeframework-texttospeech.service
@@ -1,3 +1,5 @@
+# WPEFramework TextToSpeech Initialiser
+# Activates the TextToSpeech plugin after framework initialization
 [Unit]
 Description=WPEFramework TextToSpeech Initialiser
 Requires=wpeframework.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.TextToSpeech
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-usbdevice.service b/systemd/system/wpeframework-usbdevice.service
index d611182..29c258d 100644
--- a/systemd/system/wpeframework-usbdevice.service
+++ b/systemd/system/wpeframework-usbdevice.service
@@ -1,3 +1,5 @@
+# WPEFramework UsbDevice Initialiser
+# Activates the UsbDevice plugin after framework initialization
 [Unit]
 Description=WPEFramework UsbDevice Initialiser
 Requires=wpeframework.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.UsbDevice
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-usbmassstorage.service b/systemd/system/wpeframework-usbmassstorage.service
index 68e3878..be8b74a 100644
--- a/systemd/system/wpeframework-usbmassstorage.service
+++ b/systemd/system/wpeframework-usbmassstorage.service
@@ -1,3 +1,5 @@
+# WPEFramework USBMassStorage Initialiser
+# Activates the USBMassStorage plugin after framework initialization
 [Unit]
 Description=WPEFramework USBMassStorage Initialiser
 Requires=wpeframework.service wpeframework-usbdevice.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.UsbMassStorage
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-usersettings.service b/systemd/system/wpeframework-usersettings.service
index 232e15b..1f520f3 100644
--- a/systemd/system/wpeframework-usersettings.service
+++ b/systemd/system/wpeframework-usersettings.service
@@ -1,3 +1,5 @@
+# WPEFramework UserSettings Initialiser
+# Activates the UserSettings plugin after framework initialization
 [Unit]
 Description=WPEFramework UserSettings Initialiser
 Requires=wpeframework.service wpeframework-persistentstore.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.UserSettings
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-voicecontrol.service b/systemd/system/wpeframework-voicecontrol.service
index 2f6030a..aeb0df9 100644
--- a/systemd/system/wpeframework-voicecontrol.service
+++ b/systemd/system/wpeframework-voicecontrol.service
@@ -1,3 +1,5 @@
+# WPEFramework VoiceControl Initialiser
+# Activates the VoiceControl plugin after framework initialization
 [Unit]
 Description=WPEFramework VoiceControl Initialiser
 Requires=wpeframework.service iarmbusd.service ctrlm-main.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.VoiceControl
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-wifi.service b/systemd/system/wpeframework-wifi.service
index 55f9c4f..daaf47f 100644
--- a/systemd/system/wpeframework-wifi.service
+++ b/systemd/system/wpeframework-wifi.service
@@ -1,3 +1,5 @@
+# WPEFramework Wifi Initialiser
+# Activates the Wifi plugin after framework initialization
 [Unit]
 Description=WPEFramework Wifi Initialiser
 Requires=wpeframework.service iarmbusd.service wpeframework-networkmanager.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.Wifi
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/system/wpeframework-xcast.service b/systemd/system/wpeframework-xcast.service
index 7be90b2..2e108a1 100644
--- a/systemd/system/wpeframework-xcast.service
+++ b/systemd/system/wpeframework-xcast.service
@@ -1,3 +1,5 @@
+# WPEFramework Xcast Initialiser
+# Activates the Xcast plugin after framework initialization
 [Unit]
 Description=WPEFramework Xcast Initialiser
 Requires=wpeframework-powermanager.service
@@ -6,4 +8,10 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
+TimeoutStartSec=30
+TimeoutStopSec=10
+PrivateTmp=yes
 ExecStart=/usr/bin/PluginActivator org.rdk.Xcast
+
+[Install]
+WantedBy=multi-user.target

From ae6db7b1f73708598545fd087ee4cbcab6bcd1ab Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 5 Feb 2026 20:09:30 +0000
Subject: [PATCH 3/3] Fix documentation headers for rdkshell, ocicontainer, and
 lisa services

Co-authored-by: anand-ky <37086488+anand-ky@users.noreply.github.com>
---
 systemd/system/wpeframework-lisa.service         | 4 ++--
 systemd/system/wpeframework-ocicontainer.service | 4 ++--
 systemd/system/wpeframework-rdkshell.service     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/systemd/system/wpeframework-lisa.service b/systemd/system/wpeframework-lisa.service
index efe9f65..82da751 100644
--- a/systemd/system/wpeframework-lisa.service
+++ b/systemd/system/wpeframework-lisa.service
@@ -1,5 +1,5 @@
-# WPEFramework Plugin Initialiser
-# Activates the Plugin plugin after framework initialization
+# WPEFramework LISA Initialiser
+# Activates the LISA plugin after framework initialization
 [Unit]
 Description=WPEFramework DAC LISA Plugin Initialiser
 Requires=wpeframework.service iarmbusd.service dsmgr.service
diff --git a/systemd/system/wpeframework-ocicontainer.service b/systemd/system/wpeframework-ocicontainer.service
index 910457d..5b30459 100644
--- a/systemd/system/wpeframework-ocicontainer.service
+++ b/systemd/system/wpeframework-ocicontainer.service
@@ -1,5 +1,5 @@
-# WPEFramework Plugin Initialiser
-# Activates the Plugin plugin after framework initialization
+# WPEFramework OCIContainer Initialiser
+# Activates the OCIContainer plugin after framework initialization
 [Unit]
 Description=WPEFramework OCIContainer Plugin Initialiser
 Requires=wpeframework.service iarmbusd.service dsmgr.service
diff --git a/systemd/system/wpeframework-rdkshell.service b/systemd/system/wpeframework-rdkshell.service
index 5fe76c4..3de66e4 100644
--- a/systemd/system/wpeframework-rdkshell.service
+++ b/systemd/system/wpeframework-rdkshell.service
@@ -1,5 +1,5 @@
-# WPEFramework Plugin Initialiser
-# Activates the Plugin plugin after framework initialization
+# WPEFramework RDKShell Initialiser
+# Activates the RDKShell plugin after framework initialization
 [Unit]
 Description=WPEFramework RDKShell Plugin Initialiser
 Requires=wpeframework.service iarmbusd.service dsmgr.service