diff --git a/sw-patch/debian/deb_folder/cgcs-patch-agent.dirs b/sw-patch/debian/deb_folder/cgcs-patch-agent.dirs
index 3f32d5c5..a1e3ade6 100644
--- a/sw-patch/debian/deb_folder/cgcs-patch-agent.dirs
+++ b/sw-patch/debian/deb_folder/cgcs-patch-agent.dirs
@@ -1,4 +1,5 @@
-usr/sbin
-etc/pmon.d
 etc/init.d
+etc/pmon.d
 lib/systemd/system
+usr/sbin
+usr/share/starlingx/pmon.d
diff --git a/sw-patch/debian/deb_folder/cgcs-patch-agent.install b/sw-patch/debian/deb_folder/cgcs-patch-agent.install
index 792c0314..92a7c35d 100644
--- a/sw-patch/debian/deb_folder/cgcs-patch-agent.install
+++ b/sw-patch/debian/deb_folder/cgcs-patch-agent.install
@@ -1,5 +1,6 @@
+etc/init.d/sw-patch-agent
+etc/pmon.d/sw-patch-agent.conf
+lib/systemd/system/sw-patch-agent.service
 usr/sbin/sw-patch-agent
 usr/sbin/sw-patch-agent-restart
-etc/pmon.d/sw-patch-agent.conf
-etc/init.d/sw-patch-agent
-lib/systemd/system/sw-patch-agent.service
+usr/share/starlingx/pmon.d/sw-patch-agent.conf
diff --git a/sw-patch/debian/deb_folder/cgcs-patch-controller.dirs b/sw-patch/debian/deb_folder/cgcs-patch-controller.dirs
index e153dab0..14c3ca04 100644
--- a/sw-patch/debian/deb_folder/cgcs-patch-controller.dirs
+++ b/sw-patch/debian/deb_folder/cgcs-patch-controller.dirs
@@ -1,5 +1,6 @@
-usr/sbin
-etc/pmon.d
 etc/init.d
+etc/pmon.d
 lib/systemd/system
+usr/sbin
 usr/share/bash-completion/completions
+usr/share/starlingx/pmon.d
diff --git a/sw-patch/debian/deb_folder/cgcs-patch-controller.install b/sw-patch/debian/deb_folder/cgcs-patch-controller.install
index b895296b..efb7e5d0 100644
--- a/sw-patch/debian/deb_folder/cgcs-patch-controller.install
+++ b/sw-patch/debian/deb_folder/cgcs-patch-controller.install
@@ -1,10 +1,11 @@
+etc/init.d/sw-patch-controller
+etc/init.d/sw-patch-controller-daemon
+etc/pmon.d/sw-patch-controller-daemon.conf
+lib/systemd/system/sw-patch-controller.service
+lib/systemd/system/sw-patch-controller-daemon.service
 usr/sbin/sw-patch
 usr/sbin/sw-patch-controller-daemon
 usr/sbin/sw-patch-controller-daemon-restart
 usr/sbin/upgrade-start-pkg-extract
-etc/pmon.d/sw-patch-controller-daemon.conf
-etc/init.d/sw-patch-controller-daemon
-etc/init.d/sw-patch-controller
-lib/systemd/system/sw-patch-controller-daemon.service
 usr/share/bash-completion/completions/sw-patch
-lib/systemd/system/sw-patch-controller.service
+usr/share/starlingx/pmon.d/sw-patch-controller-daemon.conf
diff --git a/sw-patch/debian/deb_folder/rules b/sw-patch/debian/deb_folder/rules
index 56442eb1..1e83ecd8 100755
--- a/sw-patch/debian/deb_folder/rules
+++ b/sw-patch/debian/deb_folder/rules
@@ -3,6 +3,7 @@
 
 export PYBUILD_NAME=cgcs-patch
 DEBIAN_DESTDIR := $(CURDIR)/debian/tmp
+PMONDIR := ${DEBIAN_DESTDIR}/usr/share/starlingx/pmon.d
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
@@ -28,6 +29,8 @@ override_dh_install:
 	install -m 700 -d ${DEBIAN_DESTDIR}/etc/patching/patch-scripts
 	install -m 755 -d ${DEBIAN_DESTDIR}/etc/pmon.d
 	install -m 755 -d ${DEBIAN_DESTDIR}/lib/systemd/system
+	install -m 755 -d ${PMONDIR}
+
 	install -m 500 bin/sw-patch-agent \
 		${DEBIAN_DESTDIR}/usr/sbin/sw-patch-agent
 	install -m 500 bin/sw-patch-controller-daemon \
@@ -43,11 +46,17 @@ override_dh_install:
 	install -m 644 bin/policy.json \
 		${DEBIAN_DESTDIR}/etc/patching/policy.json
 	install -m 444 bin/pmon-sw-patch-controller-daemon.conf \
-		${DEBIAN_DESTDIR}/etc//pmon.d/sw-patch-controller-daemon.conf
+		${DEBIAN_DESTDIR}/etc/pmon.d/sw-patch-controller-daemon.conf
 	install -m 444 bin/pmon-sw-patch-agent.conf \
 		${DEBIAN_DESTDIR}/etc/pmon.d/sw-patch-agent.conf
-	install -m 444 bin/*.service ${DEBIAN_DESTDIR}/lib/systemd/system
-	install -m 444 bin/sw-patch.completion ${DEBIAN_DESTDIR}/usr/share/bash-completion/completions/sw-patch
+	install -m 444 bin/pmon-sw-patch-controller-daemon.conf \
+		${PMONDIR}/sw-patch-controller-daemon.conf
+	install -m 444 bin/pmon-sw-patch-agent.conf \
+		${PMONDIR}/sw-patch-agent.conf
+	install -m 444 bin/*.service \
+	    ${DEBIAN_DESTDIR}/lib/systemd/system
+	install -m 444 bin/sw-patch.completion \
+	    ${DEBIAN_DESTDIR}/usr/share/bash-completion/completions/sw-patch
 	install -m 400 bin/patch-functions \
 		${DEBIAN_DESTDIR}/etc/patching/patch-functions
 	install -D -m 444 bin/patch-tmpdirs.conf \