diff --git a/service_files/xyz.openbmc_project.State.Host@.service b/service_files/xyz.openbmc_project.State.Host@.service
index fded2f0..922c39c 100644
--- a/service_files/xyz.openbmc_project.State.Host@.service
+++ b/service_files/xyz.openbmc_project.State.Host@.service
@@ -2,8 +2,8 @@
 Description=Phosphor Host%i State Manager
 Wants=mapper-wait@-xyz-openbmc_project-control-host%i-auto_reboot.service
 After=mapper-wait@-xyz-openbmc_project-control-host%i-auto_reboot.service
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis0.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis0.service
+Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
+After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 Wants=obmc-mapper.target
 After=obmc-mapper.target
 After=phosphor-ipmi-host.service