diff --git a/set-spi-mux.service.in b/set-spi-mux.service.in
index 7c47717..3236ca5 100644
--- a/set-spi-mux.service.in
+++ b/set-spi-mux.service.in
@@ -1,6 +1,7 @@
 [Unit]
 Description=Set the SPI mux
 ConditionPathExists=!/run/openbmc/chassis@0-on
+After=op-wait-power-off@0.service
 
 [Service]
 ExecStartPre=@bindir@/openpower-proc-control cfamReset
@@ -9,7 +10,7 @@
 ExecStartPost=@bindir@/openpower-proc-control scanFSI
 SyslogIdentifier=openpower-proc-control
 Type=oneshot
-RemainAfterExit=yes
 
 [Install]
 WantedBy=multi-user.target
+WantedBy=obmc-chassis-poweroff@0.target