diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb
index 50c9baf..14d6432 100644
--- a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb
+++ b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb
@@ -15,6 +15,7 @@
 	mkdir -p $D$systemd_system_unitdir/obmc-host-stop@0.target.wants
 	mkdir -p $D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires
 	mkdir -p $D$systemd_system_unitdir/obmc-host-startmin@0.target.requires
+	mkdir -p $D$systemd_system_unitdir/obmc-host-startmin@0.target.wants
 	mkdir -p $D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires
 	mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweron@0.target.requires
 	mkdir -p $D$systemd_system_unitdir/obmc-host-quiesce@0.target.wants
@@ -31,6 +32,10 @@
 	TARGET="../op-cfam-reset.service"
 	ln -s $TARGET $LINK
 
+	LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.wants/xyz.openbmc_project.Control.Host.NMI.service"
+	TARGET="../xyz.openbmc_project.Control.Host.NMI.service"
+	ln -s $TARGET $LINK
+
 	LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.requires/op-cfam-reset.service"
 	TARGET="../op-cfam-reset.service"
 	ln -s $TARGET $LINK
@@ -91,6 +96,11 @@
 		LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.wants/op-clock-data-logger@0.service"
 		TARGET="../op-clock-data-logger@.service"
 		ln -s $TARGET $LINK
+
+		mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants
+		LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants/set-spi-mux.service"
+		TARGET="../set-spi-mux.service"
+		ln -s $TARGET $LINK
 	fi
 
 	# If the memory preserving reboot feature is enabled, set it up
@@ -126,6 +136,8 @@
 	rm $LINK
 	LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.requires/op-cfam-reset.service"
 	rm $LINK
+	LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.wants/xyz.openbmc_project.Control.Host.NMI.service"
+	rm $LINK
 	# Only uninstall cfam override if p9 system
 	if [ "${@bb.utils.contains("MACHINE_FEATURES", "p9-cfam-override", "True", "False", d)}" = True ]; then
 		LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/cfam_override@0.service"
@@ -142,6 +154,9 @@
 		LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.requires/proc-pre-poweroff@0.service"
 		rm $LINK
 
+		LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants/set-spi-mux.service"
+		rm $LINK
+
 		LINK="$D$systemd_system_unitdir/multi-user.target.wants/phal-import-devtree@0.service"
 		rm $LINK