diff --git a/oam/install_scripts/columnstore-post-install.in b/oam/install_scripts/columnstore-post-install.in
index f3ae3b40c..5107014fd 100755
--- a/oam/install_scripts/columnstore-post-install.in
+++ b/oam/install_scripts/columnstore-post-install.in
@@ -158,14 +158,13 @@ if [ $user = "root" ]; then
         cp @ENGINE_SUPPORTDIR@/mcs-storagemanager.service /usr/lib/systemd/system/. >/dev/null 2>&1
         cp @ENGINE_SUPPORTDIR@/mcs-storagemanager.service /lib/systemd/system/. >/dev/null 2>&1
 
-
         systemctl enable mariadb-columnstore >/dev/null 2>&1
         systemctl enable mcs-controllernode > /dev/null 2>&1
         systemctl enable mcs-ddlproc > /dev/null 2>&1
         systemctl enable mcs-dmlproc > /dev/null 2>&1
         systemctl enable mcs-exemgr > /dev/null 2>&1
         systemctl enable mcs-primproc > /dev/null 2>&1
-        systemctl enable mcs-workernode@ > /dev/null 2>&1
+        systemctl enable mcs-workernode@1 > /dev/null 2>&1
         systemctl enable mcs-writeengineserver > /dev/null 2>&1
         systemctl enable mcs-loadbrm > /dev/null 2>&1
         systemctl enable mcs-storagemanager > /dev/null 2>&1
diff --git a/oam/install_scripts/columnstore-pre-uninstall.in b/oam/install_scripts/columnstore-pre-uninstall.in
index 291b3a8a3..d294ddb94 100755
--- a/oam/install_scripts/columnstore-pre-uninstall.in
+++ b/oam/install_scripts/columnstore-pre-uninstall.in
@@ -82,7 +82,7 @@ if [ -n "$systemctl" ] && [ $(running_systemd) -eq 0 ]; then
     systemctl disable mcs-dmlproc > /dev/null 2>&1
     systemctl disable mcs-exemgr > /dev/null 2>&1
     systemctl disable mcs-primproc > /dev/null 2>&1
-    systemctl disable mcs-workernode@.service > /dev/null 2>&1
+    systemctl disable mcs-workernode@1 > /dev/null 2>&1
     systemctl disable mcs-writeengineserver > /dev/null 2>&1
     systemctl disable mcs-loadbrm > /dev/null 2>&1
     systemctl disable mcs-storagemanager > /dev/null 2>&1
diff --git a/oam/install_scripts/mariadb-columnstore-stop.sh b/oam/install_scripts/mariadb-columnstore-stop.sh
index 3fd179f23..9bce80618 100644
--- a/oam/install_scripts/mariadb-columnstore-stop.sh
+++ b/oam/install_scripts/mariadb-columnstore-stop.sh
@@ -8,7 +8,7 @@
 /bin/systemctl stop mcs-writeengineserver
 /bin/systemctl stop mcs-primproc
 /bin/systemctl stop mcs-controllernode
-/bin/systemctl stop mcs-workernode@1.service mcs-workenrode@2.service
+/bin/systemctl stop mcs-workernode@1.service
 /bin/systemctl stop mcs-storagemanager
 
 exit 0
diff --git a/oam/install_scripts/mcs-controllernode.service.in b/oam/install_scripts/mcs-controllernode.service.in
index db04b86d2..ae5a1edce 100644
--- a/oam/install_scripts/mcs-controllernode.service.in
+++ b/oam/install_scripts/mcs-controllernode.service.in
@@ -2,8 +2,8 @@
 Description=mcs-controllernode
 
 # restart/stop mcs-controllernode on restart/stop of mcs-workernode
-PartOf=mcs-workernode@.service
-After=network.target mcs-workernode@.service
+PartOf=mcs-workernode@1.service
+After=network.target mcs-workernode@1.service
 
 [Service]
 Type=simple
diff --git a/oam/install_scripts/mcs-loadbrm.service.in b/oam/install_scripts/mcs-loadbrm.service.in
index 70ceb8de4..c834e0c73 100644
--- a/oam/install_scripts/mcs-loadbrm.service.in
+++ b/oam/install_scripts/mcs-loadbrm.service.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=loadbrm
-PartOf=mcs-workernode@.service
+PartOf=mcs-workernode@1.service mcs-workernode@2.service
 After=network.target mcs-storagemanager.service
 
 [Service]
@@ -8,4 +8,4 @@ Type=oneshot
 ExecStart=/usr/bin/env bash -c "@ENGINE_BINDIR@/mcs-loadbrm.py && sleep 2" 
 
 [Install]
-WantedBy=mcs-workernode@.service
+WantedBy=mcs-workernode@1.service mcs-workernode@2.service
diff --git a/oam/install_scripts/mcs-primproc.service.in b/oam/install_scripts/mcs-primproc.service.in
index 19ac4a472..a41db0ef0 100644
--- a/oam/install_scripts/mcs-primproc.service.in
+++ b/oam/install_scripts/mcs-primproc.service.in
@@ -2,9 +2,9 @@
 Description=mcs-primproc
 
 # restart/stop mcs-primproc on restart/stop of mcs-workernode or mcs-controllernode
-PartOf=mcs-workernode@.service
+PartOf=mcs-workernode@1.service mcs-workernode@2.service
 PartOf=mcs-controllernode.service
-After=network.target mcs-workernode@.service mcs-controllernode.service
+After=network.target mcs-workernode@1.service mcs-workernode@2.service mcs-controllernode.service
 
 [Service]
 Type=simple