diff --git a/vpd-manager/include/worker.hpp b/vpd-manager/include/worker.hpp
index 4e4f12f..c87cdce 100644
--- a/vpd-manager/include/worker.hpp
+++ b/vpd-manager/include/worker.hpp
@@ -199,16 +199,6 @@
      */
     void setJsonSymbolicLink(const std::string& i_systemJson);
 
-    /**
-     * @brief An API to parse and publish system VPD on D-Bus.
-     *
-     * Note: Throws exception in case of invalid VPD format.
-     * Moved temporarily to public space. Will be eventually moved to
-     * ibm-handler.
-     * @param[in] parsedVpdMap - Parsed VPD as a map.
-     */
-    void publishSystemVPD(const types::VPDMapVariant& parsedVpdMap);
-
   private:
     /**
      * @brief An API to parse and publish a FRU VPD over D-Bus.
@@ -431,18 +421,6 @@
                                 types::InterfaceMap& io_interfaces);
 
     /**
-     * @brief API to form asset tag string for the system.
-     *
-     * @param[in] i_parsedVpdMap - Parsed VPD map.
-     *
-     * @throw std::runtime_error
-     *
-     * @return - Formed asset tag string.
-     */
-    std::string createAssetTagString(
-        const types::VPDMapVariant& i_parsedVpdMap);
-
-    /**
      * @brief API to set present property.
      *
      * This API updates the present property of the given FRU with the given
diff --git a/vpd-manager/oem-handler/ibm_handler.cpp b/vpd-manager/oem-handler/ibm_handler.cpp
index fa3f064..ec3597b 100644
--- a/vpd-manager/oem-handler/ibm_handler.cpp
+++ b/vpd-manager/oem-handler/ibm_handler.cpp
@@ -622,6 +622,99 @@
     }
 }
 
+std::string IbmHandler::createAssetTagString(
+    const types::VPDMapVariant& i_parsedVpdMap)
+{
+    std::string l_assetTag;
+    // system VPD will be in IPZ format.
+    if (auto l_parsedVpdMap = std::get_if<types::IPZVpdMap>(&i_parsedVpdMap))
+    {
+        auto l_itrToVsys = (*l_parsedVpdMap).find(constants::recVSYS);
+        if (l_itrToVsys != (*l_parsedVpdMap).end())
+        {
+            uint16_t l_errCode = 0;
+            const std::string l_tmKwdValue{vpdSpecificUtility::getKwVal(
+                l_itrToVsys->second, constants::kwdTM, l_errCode)};
+            if (l_tmKwdValue.empty())
+            {
+                throw std::runtime_error(
+                    std::string("Failed to get value for keyword [") +
+                    constants::kwdTM +
+                    std::string("] while creating Asset tag. Error : " +
+                                commonUtility::getErrCodeMsg(l_errCode)));
+            }
+            const std::string l_seKwdValue{vpdSpecificUtility::getKwVal(
+                l_itrToVsys->second, constants::kwdSE, l_errCode)};
+            if (l_seKwdValue.empty())
+            {
+                throw std::runtime_error(
+                    std::string("Failed to get value for keyword [") +
+                    constants::kwdSE +
+                    std::string("] while creating Asset tag. Error : " +
+                                commonUtility::getErrCodeMsg(l_errCode)));
+            }
+            l_assetTag = std::string{"Server-"} + l_tmKwdValue +
+                         std::string{"-"} + l_seKwdValue;
+        }
+        else
+        {
+            throw std::runtime_error(
+                "VSYS record not found in parsed VPD map to create Asset tag.");
+        }
+    }
+    else
+    {
+        throw std::runtime_error(
+            "Invalid VPD type recieved to create Asset tag.");
+    }
+    return l_assetTag;
+}
+
+void IbmHandler::publishSystemVPD(const types::VPDMapVariant& i_parsedVpdMap)
+{
+    types::ObjectMap l_objectInterfaceMap;
+    if (std::get_if<types::IPZVpdMap>(&i_parsedVpdMap))
+    {
+        m_worker->populateDbus(i_parsedVpdMap, l_objectInterfaceMap,
+                               SYSTEM_VPD_FILE_PATH);
+        try
+        {
+            // Factory reset condition will be added in subsequent commit.
+            //  if (m_isFactoryResetDone)
+            //{
+            const auto& l_assetTag = createAssetTagString(i_parsedVpdMap);
+            auto l_itrToSystemPath = l_objectInterfaceMap.find(
+                sdbusplus::message::object_path(constants::systemInvPath));
+            if (l_itrToSystemPath == l_objectInterfaceMap.end())
+            {
+                throw std::runtime_error(
+                    "Asset tag update failed. System Path not found in object map.");
+            }
+            types::PropertyMap l_assetTagProperty;
+            l_assetTagProperty.emplace("AssetTag", l_assetTag);
+            (l_itrToSystemPath->second)
+                .emplace(constants::assetTagInf, std::move(l_assetTagProperty));
+            //}
+        }
+        catch (const std::exception& l_ex)
+        {
+            EventLogger::createSyncPel(
+                EventLogger::getErrorType(l_ex), types::SeverityType::Warning,
+                __FILE__, __FUNCTION__, 0, EventLogger::getErrorMsg(l_ex),
+                std::nullopt, std::nullopt, std::nullopt, std::nullopt);
+        }
+        // Notify PIM
+        if (!dbusUtility::callPIM(move(l_objectInterfaceMap)))
+        {
+            throw std::runtime_error("Call to PIM failed for system VPD");
+        }
+    }
+    else
+    {
+        throw DataException("Invalid format of parsed VPD map.");
+    }
+}
+
 void IbmHandler::setDeviceTreeAndJson()
 {
     // JSON is madatory for processing of this API.
@@ -725,7 +818,7 @@
         }
 
         // proceed to publish system VPD.
-        m_worker->publishSystemVPD(l_parsedVpdMap);
+        publishSystemVPD(l_parsedVpdMap);
         m_worker->setCollectionStatusProperty(
             SYSTEM_VPD_FILE_PATH, constants::vpdCollectionCompleted);
         return;
diff --git a/vpd-manager/oem-handler/ibm_handler.hpp b/vpd-manager/oem-handler/ibm_handler.hpp
index 9060dd9..d10323b 100644
--- a/vpd-manager/oem-handler/ibm_handler.hpp
+++ b/vpd-manager/oem-handler/ibm_handler.hpp
@@ -108,6 +108,27 @@
     void performBackupAndRestore(types::VPDMapVariant& io_srcVpdMap);
 
     /**
+     *  @brief An API to parse and publish system VPD on D-Bus.
+     *
+     * @throw DataException, std::runtime_error
+     *
+     * @param[in] parsedVpdMap - Parsed VPD as a map.
+     */
+    void publishSystemVPD(const types::VPDMapVariant& i_parsedVpdMap);
+
+    /**
+     * @brief API to form asset tag string for the system.
+     *
+     * @param[in] i_parsedVpdMap - Parsed VPD map.
+     *
+     * @throw std::runtime_error
+     *
+     * @return - Formed asset tag string.
+     */
+    std::string createAssetTagString(
+        const types::VPDMapVariant& i_parsedVpdMap);
+
+    /**
      * @brief Set timer to detect and set VPD collection status for the system.
      *
      * Collection of FRU VPD is triggered in a separate thread. Resulting in
diff --git a/vpd-manager/src/worker.cpp b/vpd-manager/src/worker.cpp
index 7f94cb7..40494d0 100644
--- a/vpd-manager/src/worker.cpp
+++ b/vpd-manager/src/worker.cpp
@@ -777,110 +777,6 @@
     }
 }
 
-std::string Worker::createAssetTagString(
-    const types::VPDMapVariant& i_parsedVpdMap)
-{
-    std::string l_assetTag;
-
-    // system VPD will be in IPZ format.
-    if (auto l_parsedVpdMap = std::get_if<types::IPZVpdMap>(&i_parsedVpdMap))
-    {
-        auto l_itrToVsys = (*l_parsedVpdMap).find(constants::recVSYS);
-        if (l_itrToVsys != (*l_parsedVpdMap).end())
-        {
-            uint16_t l_errCode = 0;
-            const std::string l_tmKwdValue{vpdSpecificUtility::getKwVal(
-                l_itrToVsys->second, constants::kwdTM, l_errCode)};
-
-            if (l_tmKwdValue.empty())
-            {
-                throw std::runtime_error(
-                    std::string("Failed to get value for keyword [") +
-                    constants::kwdTM +
-                    std::string("] while creating Asset tag. Error : " +
-                                commonUtility::getErrCodeMsg(l_errCode)));
-            }
-
-            const std::string l_seKwdValue{vpdSpecificUtility::getKwVal(
-                l_itrToVsys->second, constants::kwdSE, l_errCode)};
-
-            if (l_seKwdValue.empty())
-            {
-                throw std::runtime_error(
-                    std::string("Failed to get value for keyword [") +
-                    constants::kwdSE +
-                    std::string("] while creating Asset tag. Error : " +
-                                commonUtility::getErrCodeMsg(l_errCode)));
-            }
-
-            l_assetTag = std::string{"Server-"} + l_tmKwdValue +
-                         std::string{"-"} + l_seKwdValue;
-        }
-        else
-        {
-            throw std::runtime_error(
-                "VSYS record not found in parsed VPD map to create Asset tag.");
-        }
-    }
-    else
-    {
-        throw std::runtime_error(
-            "Invalid VPD type recieved to create Asset tag.");
-    }
-
-    return l_assetTag;
-}
-
-void Worker::publishSystemVPD(const types::VPDMapVariant& parsedVpdMap)
-{
-    types::ObjectMap objectInterfaceMap;
-
-    if (std::get_if<types::IPZVpdMap>(&parsedVpdMap))
-    {
-        populateDbus(parsedVpdMap, objectInterfaceMap, SYSTEM_VPD_FILE_PATH);
-
-        try
-        {
-            if (m_isFactoryResetDone)
-            {
-                const auto& l_assetTag = createAssetTagString(parsedVpdMap);
-
-                auto l_itrToSystemPath = objectInterfaceMap.find(
-                    sdbusplus::message::object_path(constants::systemInvPath));
-                if (l_itrToSystemPath == objectInterfaceMap.end())
-                {
-                    throw std::runtime_error(
-                        "Asset tag update failed. System Path not found in object map.");
-                }
-
-                types::PropertyMap l_assetTagProperty;
-                l_assetTagProperty.emplace("AssetTag", l_assetTag);
-
-                (l_itrToSystemPath->second)
-                    .emplace(constants::assetTagInf,
-                             std::move(l_assetTagProperty));
-            }
-        }
-        catch (const std::exception& l_ex)
-        {
-            EventLogger::createSyncPel(
-                EventLogger::getErrorType(l_ex), types::SeverityType::Warning,
-                __FILE__, __FUNCTION__, 0, EventLogger::getErrorMsg(l_ex),
-                std::nullopt, std::nullopt, std::nullopt, std::nullopt);
-        }
-
-        // Notify PIM
-        if (!dbusUtility::callPIM(move(objectInterfaceMap)))
-        {
-            throw std::runtime_error("Call to PIM failed for system VPD");
-        }
-    }
-    else
-    {
-        throw DataException("Invalid format of parsed VPD map.");
-    }
-}
-
 bool Worker::processPreAction(const std::string& i_vpdFilePath,
                               const std::string& i_flagToProcess,
                               uint16_t& i_errCode)