diff --git a/oam/install_scripts/controllernode.service.in b/oam/install_scripts/controllernode.service.in
index 4dba9cdde..df3619455 100644
--- a/oam/install_scripts/controllernode.service.in
+++ b/oam/install_scripts/controllernode.service.in
@@ -4,8 +4,11 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
+Type=forking
+Environment="SKIP_OAM_INIT=1"
 ExecStart=@ENGINE_BINDIR@/controllernode
 Restart=on-failure
+ExecStop=/bin/kill -9 $MAINPID
 
 [Install]
 WantedBy=columnstore.service
diff --git a/oam/install_scripts/ddlproc.service.in b/oam/install_scripts/ddlproc.service.in
index 73cf2d3dc..9d3b605d3 100644
--- a/oam/install_scripts/ddlproc.service.in
+++ b/oam/install_scripts/ddlproc.service.in
@@ -4,9 +4,11 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
+Type=simple
+Environment="SKIP_OAM_INIT=1"
 ExecStart=@ENGINE_BINDIR@/DDLProc
 Restart=on-failure
-
+ExecStop=/usr/bin/bash -c "/bin/kill -9 $(pidof DDLProc)"
 
 [Install]
 WantedBy=columnstore.service
diff --git a/oam/install_scripts/dmlproc.service.in b/oam/install_scripts/dmlproc.service.in
index ffa9dd6f7..a34be138e 100644
--- a/oam/install_scripts/dmlproc.service.in
+++ b/oam/install_scripts/dmlproc.service.in
@@ -4,8 +4,11 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
+Type=simple
+Environment="SKIP_OAM_INIT=1"
 ExecStart=@ENGINE_BINDIR@/DMLProc
 Restart=on-failure
+ExecStop=/usr/bin/bash -c "/bin/kill -9 $(pidof DMLProc)"
 
 [Install]
 WantedBy=columnstore.service
diff --git a/oam/install_scripts/exemgr.service.in b/oam/install_scripts/exemgr.service.in
index 2ddba1eee..a9df24821 100644
--- a/oam/install_scripts/exemgr.service.in
+++ b/oam/install_scripts/exemgr.service.in
@@ -4,8 +4,11 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
+Type=simple
+Environment="SKIP_OAM_INIT=1"
 ExecStart=@ENGINE_BINDIR@/ExeMgr
 Restart=on-failure
+ExecStop=/usr/bin/bash -c "/bin/kill -9 $(pidof ExeMgr)"
 
 [Install]
 WantedBy=columnstore.service
diff --git a/oam/install_scripts/primproc.service.in b/oam/install_scripts/primproc.service.in
index 85b0f7f65..07c415b09 100644
--- a/oam/install_scripts/primproc.service.in
+++ b/oam/install_scripts/primproc.service.in
@@ -4,8 +4,11 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
+Type=simple
+Environment="SKIP_OAM_INIT=1"
 ExecStart=@ENGINE_BINDIR@/PrimProc
 Restart=on-failure
+ExecStop=/usr/bin/bash -c "/bin/kill -9 $(pidof PrimProc)"
 
 [Install]
 WantedBy=columnstore.service
diff --git a/oam/install_scripts/workernode.service.in b/oam/install_scripts/workernode.service.in
index 9d1c20987..75cede697 100644
--- a/oam/install_scripts/workernode.service.in
+++ b/oam/install_scripts/workernode.service.in
@@ -4,9 +4,12 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
+Type=forking
 ExecStartPre=@ENGINE_BINDIR@/bash -c "clearShm > /dev/null 2>&1"
+ExecStartPre=/usr/bin/bash -c "/usr/bin/load_brm /var/lib/columnstore/data1/systemFiles/dbrm/$(cat /var/lib/columnstore/data1/systemFiles/dbrm/BRM_saves_current)"
 ExecStart=@ENGINE_BINDIR@/workernode DBRM_Worker1
 Restart=on-failure
+ExecStop=/bin/save_brm ; /usr/bin/bash -c "/bin/kill -9 $MAINPID"
 
 [Install]
 WantedBy=columnstore.service
diff --git a/oam/install_scripts/writeengine.service.in b/oam/install_scripts/writeengine.service.in
index 9d7e0a670..ca39707a6 100644
--- a/oam/install_scripts/writeengine.service.in
+++ b/oam/install_scripts/writeengine.service.in
@@ -4,8 +4,11 @@ PartOf=columnstore.service
 After=columnstore.service
 
 [Service]
-ExecStart=/usr/bin/WriteEngineServer
+Type=simple
+Environment="SKIP_OAM_INIT=1"
+ExecStart=@ENGINE_BINDIR@/WriteEngineServer
 Restart=on-failure
+ExecStop=/usr/bin/bash -c "/bin/kill -9 $(pidof WriteEngineServer)"
 
 [Install]
 WantedBy=columnstore.service