diff --git a/service_files/meson.build b/service_files/meson.build
index 87659ca..f6ff41a 100644
--- a/service_files/meson.build
+++ b/service_files/meson.build
@@ -10,7 +10,7 @@
     'xyz.openbmc_project.State.Chassis@.service',
     'xyz.openbmc_project.State.Host@.service',
     'xyz.openbmc_project.State.Hypervisor.service',
-    'xyz.openbmc_project.State.ScheduledHostTransition.service',
+    'xyz.openbmc_project.State.ScheduledHostTransition@.service',
     'phosphor-clear-one-time@.service',
     'phosphor-set-host-transition-to-off@.service',
     'phosphor-set-host-transition-to-running@.service',
diff --git a/service_files/xyz.openbmc_project.State.ScheduledHostTransition.service b/service_files/xyz.openbmc_project.State.ScheduledHostTransition.service
deleted file mode 100644
index 9964724..0000000
--- a/service_files/xyz.openbmc_project.State.ScheduledHostTransition.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Phosphor Scheduled Host Transition Manager
-Before=mapper-wait@-xyz-openbmc_project-state-scheduledhosttransition.service
-Wants=obmc-mapper.target
-After=obmc-mapper.target
-Wants=xyz.openbmc_project.State.Host.service
-After=xyz.openbmc_project.State.Host.service
-Wants=xyz.openbmc_project.Logging.service
-After=xyz.openbmc_project.Logging.service
-
-[Service]
-ExecStart=/usr/bin/phosphor-scheduled-host-transition
-Restart=always
-Type=dbus
-BusName=xyz.openbmc_project.State.ScheduledHostTransition
-
-[Install]
-WantedBy=multi-user.target
diff --git a/service_files/xyz.openbmc_project.State.ScheduledHostTransition@.service b/service_files/xyz.openbmc_project.State.ScheduledHostTransition@.service
new file mode 100644
index 0000000..7c7ab5d
--- /dev/null
+++ b/service_files/xyz.openbmc_project.State.ScheduledHostTransition@.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Phosphor Scheduled Host%i Transition Manager
+Wants=obmc-mapper.target
+After=obmc-mapper.target
+Wants=xyz.openbmc_project.State.Host%i.service
+After=xyz.openbmc_project.State.Host%i.service
+Wants=xyz.openbmc_project.Logging.service
+After=xyz.openbmc_project.Logging.service
+
+[Service]
+ExecStart=/usr/bin/phosphor-scheduled-host-transition --host %i
+Restart=always
+Type=dbus
+BusName=xyz.openbmc_project.State.ScheduledHostTransition%i
+
+[Install]
+WantedBy=multi-user.target