diff --git a/service_files/op-enter-mpreboot@.service.in b/service_files/op-enter-mpreboot@.service.in
index 6191ce4..1a2bad6 100644
--- a/service_files/op-enter-mpreboot@.service.in
+++ b/service_files/op-enter-mpreboot@.service.in
@@ -15,15 +15,14 @@
 @ENABLE_PHAL_TRUE@Environment="PDBG_DTB=@CEC_DEVTREE_RW_PATH@"
 RemainAfterExit=yes
 Type=oneshot
-ExecStart=/bin/sh -c \
+ExecStart=-/bin/sh -c \
   "busctl set-property xyz.openbmc_project.BIOSConfigManager \
    /xyz/openbmc_project/bios_config/manager xyz.openbmc_project.BIOSConfig.Manager \
    PendingAttributes a{s\\(sv\\)} 1 pvm_sys_dump_active \
-   xyz.openbmc_project.BIOSConfig.Manager.AttributeType.Enumeration s Enabled" \
-   || true
-ExecStart=/bin/sh -c \
+   xyz.openbmc_project.BIOSConfig.Manager.AttributeType.Enumeration s Enabled"
+ExecStart=-/bin/sh -c \
   "busctl call  xyz.openbmc_project.Dump.Manager /xyz/openbmc_project/dump/bmc \
-   xyz.openbmc_project.Dump.Create CreateDump a{sv} 0"  || true
+   xyz.openbmc_project.Dump.Create CreateDump a{sv} 0"
 ExecStart=/usr/bin/openpower-proc-control enterMpReboot
 ExecStart=/bin/mkdir -p /run/openbmc/
 ExecStart=/bin/touch /run/openbmc/mpreboot@%i
diff --git a/service_files/op-stop-instructions@.service.in b/service_files/op-stop-instructions@.service.in
index 8fada7e..63617cc 100644
--- a/service_files/op-stop-instructions@.service.in
+++ b/service_files/op-stop-instructions@.service.in
@@ -13,7 +13,7 @@
 RemainAfterExit=yes
 Type=oneshot
 TimeoutStartSec=20
-ExecStart=/bin/sh -c 'systemctl stop attn_handler.service || true'
+ExecStart=-/bin/sh -c 'systemctl stop attn_handler.service'
 ExecStart=/usr/bin/openpower-proc-control threadStopAll
 
 [Install]