diff --git a/op-stop-instructions@.service.in b/op-stop-instructions@.service.in
index 160a8bb..b068fac 100644
--- a/op-stop-instructions@.service.in
+++ b/op-stop-instructions@.service.in
@@ -12,9 +12,10 @@
 [Service]
 RemainAfterExit=yes
 Type=oneshot
+TimeoutStartSec=10
+ExecStart=/bin/rm -f /run/openbmc/host@%i-on
 # TODO - Replace with official istep stopinstructions once available
 ExecStart=/usr/bin/pdbg -a stop
-ExecStart=/bin/rm -f /run/openbmc/host@%i-on
 
 [Install]
 WantedBy=obmc-host-stop@%i.target