diff --git a/service_files/op-stop-instructions@.service.in b/service_files/op-stop-instructions@.service.in
index 36fb0a8..af5646e 100644
--- a/service_files/op-stop-instructions@.service.in
+++ b/service_files/op-stop-instructions@.service.in
@@ -13,8 +13,7 @@
 RemainAfterExit=yes
 Type=oneshot
 TimeoutStartSec=10
-# TODO - Replace with official istep stopinstructions once available
-ExecStart=/usr/bin/pdbg -a stop
+ExecStart=/usr/bin/openpower-proc-control threadStopAll
 
 [Install]
 WantedBy=obmc-host-stop@%i.target