diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
index dc3174d..c1de92f 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
index 1321c21..40dbf36 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
+++ b/meta-phosphor/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
diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
index c426c44..f062fc9 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
+++ b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
@@ -7,5 +7,5 @@
 [Service]
 Type=oneshot
 Restart=no
-ExecStart=/usr/bin/env mapper call /org/openbmc/control/fans org.openbmc.control.Fans setMax
-SyslogIdentifier=mapper
+ExecStart=/bin/sh -c "busctl call `mapper get-service /org/openbmc/control/fans` /org/openbmc/control/fans org.openbmc.control.Fans setMax"
+SyslogIdentifier=obmc-max-fans
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
index d9355b3..de196d0 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
@@ -5,8 +5,8 @@
 
 [Service]
 Restart=no
-ExecStart=/usr/bin/env mapper call /org/openbmc/control/flash/bios org.openbmc.Flash init
-SyslogIdentifier=mapper
+ExecStart=/bin/sh -c "busctl call `mapper get-service /org/openbmc/control/flash/bios` /org/openbmc/control/flash/bios org.openbmc.Flash init"
+SyslogIdentifier=obmc-flash-init
 
 [Install]
 WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
index 2617941..8703a43 100644
--- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
+++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
@@ -14,8 +14,8 @@
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/bin/env mapper call /org/openbmc/control/host%i org.openbmc.control.Host boot
-SyslogIdentifier=mapper
+ExecStart=/bin/sh -c "busctl call `mapper get-service /org/openbmc/control/host%i` /org/openbmc/control/host%i org.openbmc.control.Host boot"
+SyslogIdentifier=op-start-host
 
 [Install]
 WantedBy=obmc-host-start@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service
index 38d6c5a..e0e1fc9 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service
+++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service
@@ -8,5 +8,5 @@
 Type=oneshot
 RemainAfterExit=yes
 Restart=no
-ExecStart=/usr/bin/env mapper call /xyz/openbmc_project/led/groups/%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.Led.Group Asserted b true
-SyslogIdentifier=mapper
+ExecStart=/bin/sh -c "busctl call `mapper get-service /xyz/openbmc_project/led/groups/%i` /xyz/openbmc_project/led/groups/%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.Led.Group Asserted b true"
+SyslogIdentifier=obmc-led-group-start
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service
index 93db03e..7b39669 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service
+++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service
@@ -8,5 +8,5 @@
 Type=oneshot
 RemainAfterExit=yes
 Restart=no
-ExecStart=/usr/bin/env mapper call /xyz/openbmc_project/led/groups/%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.Led.Group Asserted b false
-SyslogIdentifier=mapper
+ExecStart=/bin/sh -c "busctl call `mapper get-service /xyz/openbmc_project/led/groups/%i` /xyz/openbmc_project/led/groups/%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.Led.Group Asserted b false"
+SyslogIdentifier=obmc-led-group-stop
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service
index b3d8d4f..0cf5e7c 100644
--- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service
+++ b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service
@@ -9,6 +9,6 @@
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/env mapper call /xyz/openbmc_project/watchdog/host%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.State.Watchdog Enabled b true
-SyslogIdentifier=mapper
+ExecStart=/bin/sh -c "busctl call `mapper get-service /xyz/openbmc_project/watchdog/host%i` /xyz/openbmc_project/watchdog/host%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.State.Watchdog Enabled b true"
 RemainAfterExit=yes
+SyslogIdentifier=obmc-enable-host-watchdog