diff --git a/software/debian/deb_folder/rules b/software/debian/deb_folder/rules
index 08a8efaf..f7e45726 100755
--- a/software/debian/deb_folder/rules
+++ b/software/debian/deb_folder/rules
@@ -2,9 +2,9 @@
 export DH_VERBOSE = 1
 export PYBUILD_NAME = software
 export PBR_VERSION=1.0.0
-PMONDIR := ${ROOT}/usr/share/starlingx/pmon.d
 
 ROOT := $(CURDIR)/debian/tmp
+PMONDIR := ${ROOT}/usr/share/starlingx/pmon.d
 export PLATFORM_RELEASE="$(shell grep SW_VERSION /usr/include/build_info.h | cut -d ' ' -f 3)"
 export METADATA_FILE="starlingx-${PLATFORM_RELEASE}.0-metadata.xml"
 
diff --git a/software/debian/deb_folder/software.install b/software/debian/deb_folder/software.install
index 02b86a21..fc0120a4 100644
--- a/software/debian/deb_folder/software.install
+++ b/software/debian/deb_folder/software.install
@@ -7,3 +7,5 @@ run/software-tmpdirs.conf
 usr/bin
 usr/lib/python*/dist-packages/*
 usr/sbin
+usr/share/starlingx/pmon.d/software-controller-daemon.conf
+usr/share/starlingx/pmon.d/software-agent.conf
diff --git a/software/service-files/software-agent.service b/software/service-files/software-agent.service
index 94013aec..7ce192f7 100644
--- a/software/service-files/software-agent.service
+++ b/software/service-files/software-agent.service
@@ -10,6 +10,8 @@ ExecStart=/etc/init.d/software-agent start
 ExecStop=/etc/init.d/software-agent stop
 ExecReload=/etc/init.d/software-agent restart
 PIDFile=/var/run/software-agent.pid
+# process recovery is handled by pmon
+Restart=no
 
 [Install]
 WantedBy=multi-user.target
diff --git a/software/service-files/software-controller-daemon.service b/software/service-files/software-controller-daemon.service
index 9f373f27..e55733f8 100644
--- a/software/service-files/software-controller-daemon.service
+++ b/software/service-files/software-controller-daemon.service
@@ -10,6 +10,8 @@ ExecStart=/etc/init.d/software-controller-daemon start
 ExecStop=/etc/init.d/software-controller-daemon stop
 ExecReload=/etc/init.d/software-controller-daemon restart
 PIDFile=/var/run/software-controller-daemon.pid
+# process recovery is handled by pmon
+Restart=no
 
 [Install]
 WantedBy=multi-user.target