diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg
index ae520f1a..84d3b543 100644
--- a/kickstart/files/kickstart.cfg
+++ b/kickstart/files/kickstart.cfg
@@ -2377,6 +2377,25 @@ ilog "***********************************************************************"
 # Launchpad: #1983580
 rm ${IMAGE_ROOTFS}/var/lib/dpkg/triggers/Unincorp
 
+if [ ! "${controller}" = true -a "${worker}" = true ] ; then
+    ilog "Setting up pmon configs for standalone ${TRAIT__WORKER} personality"
+    ilog "This will be removed when packaging is updated"
+
+    rm ${IMAGE_ROOTFS}/etc/pmon.d/hbsAgent.conf
+    rm ${IMAGE_ROOTFS}/etc/pmon.d/fm-api.conf
+    rm ${IMAGE_ROOTFS}/etc/pmon.d/sm-api.conf
+    rm ${IMAGE_ROOTFS}/etc/pmon.d/sm.conf
+    rm ${IMAGE_ROOTFS}/etc/pmon.d/sm-watchdog.conf
+    rm ${IMAGE_ROOTFS}/etc/pmon.d/sw-patch-controller-daemon.conf
+
+    ln -s /dev/null ${IMAGE_ROOTFS}/etc/pmon.d/hbsAgent.conf
+    ln -s /dev/null ${IMAGE_ROOTFS}/etc/pmon.d/fm-api.conf
+    ln -s /dev/null ${IMAGE_ROOTFS}/etc/pmon.d/sm-api.conf
+    ln -s /dev/null ${IMAGE_ROOTFS}/etc/pmon.d/sm.conf
+    ln -s /dev/null ${IMAGE_ROOTFS}/etc/pmon.d/sm-watchdog.conf
+    ln -s /dev/null ${IMAGE_ROOTFS}/etc/pmon.d/sw-patch-controller-daemon.conf
+fi
+
 true
 %end