diff --git a/oam/install_scripts/mcs-controllernode.service.in b/oam/install_scripts/mcs-controllernode.service.in
index 330b52591..37f7c67c9 100644
--- a/oam/install_scripts/mcs-controllernode.service.in
+++ b/oam/install_scripts/mcs-controllernode.service.in
@@ -9,7 +9,7 @@ Environment="SKIP_OAM_INIT=1"
 ExecStart=@ENGINE_BINDIR@/controllernode
 Restart=on-failure
 ExecStop=@ENGINE_BINDIR@/mcs-stop-controllernode.sh
-TimeoutStopSec=$(mcsGetConfig SystemConfig DBRMTimeout)
+TimeoutStopSec=15
 
 [Install]
 WantedBy=mariadb-columnstore.service
diff --git a/oam/install_scripts/mcs-ddlproc.service.in b/oam/install_scripts/mcs-ddlproc.service.in
index cf27795a9..44f3c5494 100644
--- a/oam/install_scripts/mcs-ddlproc.service.in
+++ b/oam/install_scripts/mcs-ddlproc.service.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=mcs-ddlproc
-PartOf=mcs-writeengineserver.service
+PartOf=mcs-exemgr.service
 After=mcs-dmlproc.service
 
 [Service]
diff --git a/oam/install_scripts/mcs-dmlproc.service.in b/oam/install_scripts/mcs-dmlproc.service.in
index d922623b1..a25841a99 100644
--- a/oam/install_scripts/mcs-dmlproc.service.in
+++ b/oam/install_scripts/mcs-dmlproc.service.in
@@ -1,7 +1,7 @@
 [Unit]
 Description=mcs-dmlproc
-PartOf=mcs-writeengineserver.service
-After=mcs-writeengineserver.service
+PartOf=mcs-exemgr.service
+After=mcs-exemgr.service
 
 [Service]
 Type=simple
diff --git a/oam/install_scripts/mcs-primproc.service.in b/oam/install_scripts/mcs-primproc.service.in
index 92a5e7c59..84c08d436 100644
--- a/oam/install_scripts/mcs-primproc.service.in
+++ b/oam/install_scripts/mcs-primproc.service.in
@@ -1,6 +1,7 @@
 [Unit]
 Description=mcs-primproc
 PartOf=mcs-workernode.service
+PartOf=mcs-controllernode.service
 After=mcs-controllernode.service
 
 [Service]
diff --git a/oam/install_scripts/mcs-stop-controllernode.sh.in b/oam/install_scripts/mcs-stop-controllernode.sh.in
index 8a58cc002..9bffe69aa 100644
--- a/oam/install_scripts/mcs-stop-controllernode.sh.in
+++ b/oam/install_scripts/mcs-stop-controllernode.sh.in
@@ -1,3 +1,2 @@
 #!/bin/bash
-kill -15 $(pidof workernode)
-kill -15 $(pidof controllernode)
+systemctl stop mcs-workernode --ignore-dependencies