diff --git a/service-mgmt-api/debian/deb_folder/rules b/service-mgmt-api/debian/deb_folder/rules
index 592fa68e..0751c7b5 100755
--- a/service-mgmt-api/debian/deb_folder/rules
+++ b/service-mgmt-api/debian/deb_folder/rules
@@ -25,12 +25,10 @@ override_dh_install:
 	install -d $(ROOT)/usr/lib/systemd/system/
 	install -m 644 -p -D scripts/sm_api.ini $(ROOT)/etc/sm
 	install -m 755 -p -D scripts/sm-api $(ROOT)/etc/init.d
+	install -m 644 -p -D scripts/sm-api.service $(ROOT)/usr/lib/systemd/system/
 	install -m 644 -p -D scripts/sm-api.conf $(ROOT)/etc/pmon.d
 
 	dh_install
 
 override_dh_python3:
 	dh_python3 --shebang=/usr/bin/python3
-
-override_dh_installsystemd:
-	dh_installsystemd --name sm-api
diff --git a/service-mgmt-api/debian/deb_folder/sm-api.install b/service-mgmt-api/debian/deb_folder/sm-api.install
index c0811f49..f49c9e40 100644
--- a/service-mgmt-api/debian/deb_folder/sm-api.install
+++ b/service-mgmt-api/debian/deb_folder/sm-api.install
@@ -3,4 +3,5 @@ usr/bin/sm-api
 etc/init.d/sm-api
 etc/pmon.d/sm-api.conf
 etc/sm/sm_api.ini
+usr/lib/systemd/system/*
 usr/lib/python*/dist-packages/*
diff --git a/service-mgmt-api/debian/deb_folder/sm-api.service b/service-mgmt-api/debian/deb_folder/sm-api.service
deleted file mode 100644
index 11a35104..00000000
--- a/service-mgmt-api/debian/deb_folder/sm-api.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Service Management API Unit
-After=network-online.target syslog-ng.service config.service sm.service
-Before=sm-eru.service pmon.service
-
-[Service]
-Type=forking
-RemainAfterExit=yes
-User=root
-ExecStart=/etc/init.d/sm-api start
-ExecStop=/etc/init.d/sm-api stop
-PIDFile=/var/run/sm-api.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/service-mgmt/sm-common/debian/deb_folder/postinst b/service-mgmt/sm-common/debian/deb_folder/postinst
deleted file mode 100644
index 79b1b964..00000000
--- a/service-mgmt/sm-common/debian/deb_folder/postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-mkdir -p /usr/lib/sm
-mv /usr/lib64/libsm_common.so* /usr/lib/sm
-systemctl enable sm-watchdog
-
-#DEBHELPER#
-exit 0
\ No newline at end of file
diff --git a/service-mgmt/sm-common/debian/deb_folder/rules b/service-mgmt/sm-common/debian/deb_folder/rules
index c381a55f..fec96232 100755
--- a/service-mgmt/sm-common/debian/deb_folder/rules
+++ b/service-mgmt/sm-common/debian/deb_folder/rules
@@ -21,9 +21,6 @@ override_dh_auto_install:
 		VER_MJR=${VER_MJR} \
 		install
 
-override_dh_installsystemd:
-	dh_installsystemd --name sm-eru
-
 # Prevents dh_fixperms from changing the permissions defined in the makefiles
 override_dh_fixperms:
 	dh_fixperms \
diff --git a/service-mgmt/sm-common/debian/deb_folder/sm-common.install b/service-mgmt/sm-common/debian/deb_folder/sm-common.install
index 8ea2f606..a50f53a9 100644
--- a/service-mgmt/sm-common/debian/deb_folder/sm-common.install
+++ b/service-mgmt/sm-common/debian/deb_folder/sm-common.install
@@ -1,3 +1,4 @@
 etc/init.d/sm-watchdog
 etc/pmon.d/sm-watchdog.conf
 usr/bin/sm-watchdog
+usr/lib/systemd/system/sm-watchdog.service
diff --git a/service-mgmt/sm-common/debian/deb_folder/sm-eru.install b/service-mgmt/sm-common/debian/deb_folder/sm-eru.install
index 38b0cfb7..e9173081 100644
--- a/service-mgmt/sm-common/debian/deb_folder/sm-eru.install
+++ b/service-mgmt/sm-common/debian/deb_folder/sm-eru.install
@@ -2,3 +2,4 @@ etc/init.d/sm-eru
 etc/pmon.d/sm-eru.conf
 usr/bin/sm-eru
 usr/bin/sm-eru-dump
+usr/lib/systemd/system/sm-eru.service
diff --git a/service-mgmt/sm-common/debian/deb_folder/sm-eru.service b/service-mgmt/sm-common/debian/deb_folder/sm-eru.service
deleted file mode 100644
index 0c35ffe7..00000000
--- a/service-mgmt/sm-common/debian/deb_folder/sm-eru.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Service Management Event Recorder Unit
-After=network-online.target syslog-ng.service sm-api.service
-Before=pmon.service
-
-[Service]
-Type=forking
-RemainAfterExit=yes
-User=root
-ExecStart=/etc/init.d/sm-eru start
-ExecStop=/etc/init.d/sm-eru stop
-PIDFile=/var/run/sm-eru.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/service-mgmt/sm-common/debian/deb_folder/sm-watchdog.service b/service-mgmt/sm-common/debian/deb_folder/sm-watchdog.service
deleted file mode 100644
index 5fd147a5..00000000
--- a/service-mgmt/sm-common/debian/deb_folder/sm-watchdog.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Service Management Watchdog
-After=network-online.target syslog-ng.service config.service
-Before=sm.service pmon.service
-
-[Service]
-Type=forking
-RemainAfterExit=yes
-User=root
-ExecStart=/etc/init.d/sm-watchdog start
-ExecStop=/etc/init.d/sm-watchdog stop
-PIDFile=/var/run/sm-watchdog.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/service-mgmt/sm-db/debian/deb_folder/postinst b/service-mgmt/sm-db/debian/deb_folder/postinst
deleted file mode 100644
index 208b869d..00000000
--- a/service-mgmt/sm-db/debian/deb_folder/postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-mkdir -p /usr/lib/sm
-mv /usr/lib64/libsm_db.so* /usr/lib/sm
-
-#DEBHELPER#
-exit 0
\ No newline at end of file
diff --git a/service-mgmt/sm/debian/deb_folder/postinst b/service-mgmt/sm/debian/deb_folder/postinst
deleted file mode 100644
index 86e90fbe..00000000
--- a/service-mgmt/sm/debian/deb_folder/postinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e
-
-/usr/bin/systemctl enable sm-shutdown.service >/dev/null 2>&1
-
-#DEBHELPER#
-exit 0
\ No newline at end of file
diff --git a/service-mgmt/sm/debian/deb_folder/rules b/service-mgmt/sm/debian/deb_folder/rules
index 17856a61..76f32890 100755
--- a/service-mgmt/sm/debian/deb_folder/rules
+++ b/service-mgmt/sm/debian/deb_folder/rules
@@ -9,9 +9,6 @@ override_dh_usrlocal:
 	# dh_usrlocal complains about files being put in /usr/local
 	# this empty override causes dh_usrlocal to be skipped.
 
-override_dh_installsystemd:
-	dh_installsystemd --name sm
-
 override_dh_auto_install:
 	rm -rf ${ROOT}
 	$(MAKE) DEST_DIR=${ROOT} \
diff --git a/service-mgmt/sm/debian/deb_folder/sm-shutdown.service b/service-mgmt/sm/debian/deb_folder/sm-shutdown.service
deleted file mode 100644
index 5b093dfd..00000000
--- a/service-mgmt/sm/debian/deb_folder/sm-shutdown.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Service Management Shutdown Unit
-After=sm.service
-
-[Service]
-Type=oneshot
-User=root
-ExecStop=/etc/init.d/sm-shutdown stop
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/service-mgmt/sm/debian/deb_folder/sm.install b/service-mgmt/sm/debian/deb_folder/sm.install
index 1ba4a9ed..c8ed864d 100644
--- a/service-mgmt/sm/debian/deb_folder/sm.install
+++ b/service-mgmt/sm/debian/deb_folder/sm.install
@@ -1,3 +1,4 @@
+usr/lib/systemd/system/*
 usr/bin/sm
 usr/local/sbin/sm-notify
 usr/local/sbin/sm-troubleshoot
diff --git a/service-mgmt/sm/debian/deb_folder/sm.service b/service-mgmt/sm/debian/deb_folder/sm.service
deleted file mode 100644
index 1186692b..00000000
--- a/service-mgmt/sm/debian/deb_folder/sm.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Service Management Unit
-After=network-online.target syslog-ng.service config.service sm-watchdog.service systemd-udev-settle.service drbd.service
-Before=sm-shutdown.service sm-api.service pmon.service
-
-[Service]
-Type=forking
-RemainAfterExit=yes
-User=root
-ExecStart=/etc/init.d/sm start
-ExecStop=/etc/init.d/sm stop
-PIDFile=/var/run/sm.pid
-KillMode=process
-RestartSec=10
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/service-mgmt/sm/scripts/sm b/service-mgmt/sm/scripts/sm
index 47649f61..55e89e68 100755
--- a/service-mgmt/sm/scripts/sm
+++ b/service-mgmt/sm/scripts/sm
@@ -22,7 +22,7 @@
 ### END INIT INFO
 
 . /etc/init.d/functions
-export LD_LIBRARY_PATH=/usr/lib/sm
+
 RETVAL=0
 
 SM_NAME="sm"