diff --git a/extensions/openpower-pels/data_interface.cpp b/extensions/openpower-pels/data_interface.cpp
index c21bf5d..da499db 100644
--- a/extensions/openpower-pels/data_interface.cpp
+++ b/extensions/openpower-pels/data_interface.cpp
@@ -37,6 +37,7 @@
 constexpr auto vpdManager = "com.ibm.VPD.Manager";
 constexpr auto ledGroupManager = "xyz.openbmc_project.LED.GroupManager";
 constexpr auto logSetting = "xyz.openbmc_project.Settings";
+constexpr auto hwIsolation = "org.open_power.HardwareIsolation";
 } // namespace service_name
 
 namespace object_path
@@ -55,6 +56,7 @@
     "/xyz/openbmc_project/logging/send_event_logs_to_host";
 constexpr auto vpdManager = "/com/ibm/VPD/Manager";
 constexpr auto logSetting = "/xyz/openbmc_project/logging/settings";
+constexpr auto hwIsolation = "/xyz/openbmc_project/hardware_isolation";
 } // namespace object_path
 
 namespace interface
@@ -83,6 +85,7 @@
 constexpr auto association = "xyz.openbmc_project.Association.Definitions";
 constexpr auto dumpEntry = "xyz.openbmc_project.Dump.Entry";
 constexpr auto dumpProgress = "xyz.openbmc_project.Common.Progress";
+constexpr auto hwIsolationCreate = "org.open_power.HardwareIsolation.Create";
 } // namespace interface
 
 using namespace sdbusplus::xyz::openbmc_project::State::Boot::server;
@@ -688,5 +691,39 @@
     return result;
 }
 
+void DataInterface::createGuardRecord(const std::vector<uint8_t>& binPath,
+                                      const std::string& type,
+                                      const std::string& logPath) const
+{
+    try
+    {
+        auto method = _bus.new_method_call(
+            service_name::hwIsolation, object_path::hwIsolation,
+            interface::hwIsolationCreate, "CreateWithEntityPath");
+        method.append(binPath, type, sdbusplus::message::object_path(logPath));
+        // Note: hw isolation "CreateWithEntityPath" got dependency on logging
+        // api's. Making d-bus call no reply type to avoid cyclic dependency.
+        // Added minimal timeout to catch initial failures.
+        // Need to revisit this design later to avoid cyclic dependency.
+        constexpr auto dbusTimeout = 100000; // in micro seconds
+        _bus.call_noreply(method, dbusTimeout);
+    }
+
+    catch (const sdbusplus::exception::exception& e)
+    {
+        std::string errName = e.name();
+        // SD_BUS_ERROR_TIMEOUT error is expected, due to PEL api dependency
+        // mentioned above. Ignoring the error.
+        if (errName != SD_BUS_ERROR_TIMEOUT)
+        {
+            log<level::ERR>(
+                fmt::format("GUARD D-Bus call exception"
+                            "OBJPATH={}, INTERFACE={}, EXCEPTION={}",
+                            object_path::hwIsolation,
+                            interface::hwIsolationCreate, e.what())
+                    .c_str());
+        }
+    }
+}
 } // namespace pels
 } // namespace openpower
diff --git a/extensions/openpower-pels/data_interface.hpp b/extensions/openpower-pels/data_interface.hpp
index fc902a0..f5053aa 100644
--- a/extensions/openpower-pels/data_interface.hpp
+++ b/extensions/openpower-pels/data_interface.hpp
@@ -345,6 +345,17 @@
     virtual std::vector<bool>
         checkDumpStatus(const std::vector<std::string>& type) const = 0;
 
+    /**
+     * @brief Create guard record
+     *
+     *  @param[in] binPath: phal devtree binary path used as key
+     *  @param[in] type: Guard type
+     *  @param[in] logPath: error log entry object path
+     */
+    virtual void createGuardRecord(const std::vector<uint8_t>& binPath,
+                                   const std::string& type,
+                                   const std::string& logPath) const = 0;
+
   protected:
     /**
      * @brief Sets the host on/off state and runs any
@@ -633,6 +644,17 @@
     std::vector<bool>
         checkDumpStatus(const std::vector<std::string>& type) const override;
 
+    /**
+     * @brief Create guard record
+     *
+     *  @param[in] binPath: phal devtree binary path used as key
+     *  @param[in] type: Guard type
+     *  @param[in] logPath: error log entry object path
+     */
+    void createGuardRecord(const std::vector<uint8_t>& binPath,
+                           const std::string& type,
+                           const std::string& logPath) const override;
+
   private:
     /**
      * @brief Reads the BMC firmware version string and puts it into
