diff --git a/mtce-control/debian/deb_folder/control b/mtce-control/debian/deb_folder/control
index d5a7337e..5558eb8c 100644
--- a/mtce-control/debian/deb_folder/control
+++ b/mtce-control/debian/deb_folder/control
@@ -2,8 +2,7 @@ Source: mtce-control
 Section: admin
 Priority: optional
 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
-Build-Depends: debhelper-compat (= 13),
- libsystemd-dev
+Build-Depends: debhelper-compat (= 13)
 Standards-Version: 4.5.1
 Homepage: https://www.starlingx.io
 
diff --git a/mtce-control/debian/deb_folder/mtce-control.install b/mtce-control/debian/deb_folder/mtce-control.install
index 1bdf964d..b7cce677 100644
--- a/mtce-control/debian/deb_folder/mtce-control.install
+++ b/mtce-control/debian/deb_folder/mtce-control.install
@@ -1,3 +1,5 @@
 etc/init.d/goenabledControl
 etc/init.d/hbsAgent
 etc/pmon.d/hbsAgent.conf
+lib/systemd/system/hbsAgent.service
+debian/systemd/00-mtce-control.preset etc/systemd/system-preset
diff --git a/mtce-control/debian/deb_folder/not-installed b/mtce-control/debian/deb_folder/not-installed
new file mode 100644
index 00000000..e4acae60
--- /dev/null
+++ b/mtce-control/debian/deb_folder/not-installed
@@ -0,0 +1 @@
+/usr/share/licenses/mtce-control-1.0/LICENSE
diff --git a/mtce-control/debian/deb_folder/rules b/mtce-control/debian/deb_folder/rules
index 95a8b796..f19c83d7 100644
--- a/mtce-control/debian/deb_folder/rules
+++ b/mtce-control/debian/deb_folder/rules
@@ -2,18 +2,17 @@
 # export DH_VERBOSE = 1
 
 export ROOT = debian/tmp
-export INITDIR = $(ROOT)/etc/init.d
-export PMONDIR = $(ROOT)/etc/pmon.d
 
 %:
 	dh $@
 
 override_dh_auto_install:
-	install -m 755 -d $(INITDIR)
-	install -m 755 -p -D scripts/goenabled $(INITDIR)/goenabledControl
-	install -m 755 -p -D scripts/hbsAgent $(INITDIR)
-	install -m 755 -d $(PMONDIR)
-	install -m 644 -p -D scripts/hbsAgent.conf $(PMONDIR)
+	$(MAKE) buildroot=$(ROOT) \
+		_sysconfdir=/etc \
+		_unitdir=/lib/systemd/system \
+		_datarootdir=/usr/share \
+		install
+	dh_install
 
 override_dh_installsystemd:
-	dh_installsystemd --name hbsAgent
+	dh_installsystemd -pmtce-control --name hbsAgent hbsAgent.service
diff --git a/mtce-control/debian/deb_folder/systemd/00-mtce-control.preset b/mtce-control/debian/deb_folder/systemd/00-mtce-control.preset
new file mode 100644
index 00000000..e4106779
--- /dev/null
+++ b/mtce-control/debian/deb_folder/systemd/00-mtce-control.preset
@@ -0,0 +1 @@
+enable hbsAgent.service