diff --git a/host_condition_gpio/host_condition_main.cpp b/host_condition_gpio/host_condition_main.cpp
index 6912b7c..38a444a 100644
--- a/host_condition_gpio/host_condition_main.cpp
+++ b/host_condition_gpio/host_condition_main.cpp
@@ -23,7 +23,7 @@
     auto bus = sdbusplus::bus::new_default();
     std::string objGroupName = HOST_GPIOS_OBJPATH;
     std::string objPathInst = objGroupName + "/host" + hostId;
-    std::string busName = HOST_GPIOS_BUSNAME;
+    std::string busName = HOST_GPIOS_BUSNAME + hostId;
 
     // Add sdbusplus ObjectManager
     sdbusplus::server::manager_t objManager(bus, objGroupName.c_str());
diff --git a/host_condition_gpio/phosphor-host-condition-gpio@.service b/host_condition_gpio/phosphor-host-condition-gpio@.service
index fa70e3e..19e41c5 100644
--- a/host_condition_gpio/phosphor-host-condition-gpio@.service
+++ b/host_condition_gpio/phosphor-host-condition-gpio@.service
@@ -5,7 +5,7 @@
 Restart=always
 ExecStart=/usr/bin/phosphor-host-condition-gpio %i
 Type=dbus
-BusName=xyz.openbmc_project.State.HostCondition.Gpio
+BusName=xyz.openbmc_project.State.HostCondition.Gpio%i
 
 [Install]
 WantedBy=multi-user.target