diff --git a/software_manager.cpp b/software_manager.cpp
index 3ee9f1a..651b758 100644
--- a/software_manager.cpp
+++ b/software_manager.cpp
@@ -1,8 +1,12 @@
+#include "config.h"
+
 #include "item_updater.hpp"
 
 #include <phosphor-logging/lg2.hpp>
 #include <sdbusplus/async.hpp>
 
+#include <string>
+
 using ItemUpdaterIntf = phosphor::software::updater::ItemUpdater;
 
 PHOSPHOR_LOG2_USING;
@@ -10,13 +14,19 @@
 int main()
 {
     info("Creating Software Manager");
-    auto path = std::string(SOFTWARE_OBJPATH) + "/bmc";
+    auto bmcPath = std::string(SOFTWARE_OBJPATH) + "/bmc";
+    auto biosPath = std::string(SOFTWARE_OBJPATH) + "/bios";
     sdbusplus::async::context ctx;
     sdbusplus::server::manager_t manager{ctx, SOFTWARE_OBJPATH};
 
     constexpr auto serviceName = "xyz.openbmc_project.Software.Manager";
 
-    ItemUpdaterIntf itemUpdater{ctx, path};
+    ItemUpdaterIntf bmcItemUpdater{ctx, bmcPath,
+                                   ItemUpdaterIntf::UpdaterType::BMC};
+#ifdef HOST_BIOS_UPGRADE
+    ItemUpdaterIntf biosItemUpdater{ctx, biosPath,
+                                    ItemUpdaterIntf::UpdaterType::BIOS};
+#endif // HOST_BIOS_UPGRADE
     ctx.request_name(serviceName);
 
     ctx.run();