diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
index dc3174d..c1de92f 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
@@ -12,8 +12,8 @@
 [Service]
 RemainAfterExit=yes
 Type=oneshot
-ExecStart=/usr/bin/env mapper call /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 1
-SyslogIdentifier=mapper
+ExecStart=/bin/sh -c "busctl call `mapper get-service /org/openbmc/control/power%i` /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 1"
+SyslogIdentifier=op-power-start
 
 [Install]
 WantedBy=obmc-host-start@%i.target
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
index 1321c21..40dbf36 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
@@ -10,8 +10,8 @@
 
 [Service]
 RemainAfterExit=yes
-ExecStart=/usr/bin/env mapper call /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 0
-SyslogIdentifier=mapper
+ExecStart=/bin/sh -c "busctl call `mapper get-service /org/openbmc/control/power%i` /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 0"
+SyslogIdentifier=op-power-stop
 
 [Install]
 WantedBy=obmc-host-stop@%i.target