diff --git a/libpldmresponder/fru.cpp b/libpldmresponder/fru.cpp
index 74dd8a2..3ec5d92 100644
--- a/libpldmresponder/fru.cpp
+++ b/libpldmresponder/fru.cpp
@@ -5,6 +5,7 @@
 
 #include "common/utils.hpp"
 
+#include <config.h>
 #include <systemd/sd-journal.h>
 
 #include <sdbusplus/bus.hpp>
@@ -224,9 +225,9 @@
                 recordSetIdentifier = nextRSI();
                 bmc_record_handle = nextRecordHandle();
                 pldm_pdr_add_fru_record_set(
-                    pdrRepo, 0, recordSetIdentifier, entity.entity_type,
-                    entity.entity_instance_num, entity.entity_container_id,
-                    bmc_record_handle);
+                    pdrRepo, TERMINUS_HANDLE, recordSetIdentifier,
+                    entity.entity_type, entity.entity_instance_num,
+                    entity.entity_container_id, bmc_record_handle);
             }
             auto curSize = table.size();
             table.resize(curSize + recHeaderSize + tlvs.size());
diff --git a/libpldmresponder/pdr.hpp b/libpldmresponder/pdr.hpp
index 4870c4a..f9ebf52 100644
--- a/libpldmresponder/pdr.hpp
+++ b/libpldmresponder/pdr.hpp
@@ -3,6 +3,7 @@
 #include "common/utils.hpp"
 #include "libpldmresponder/pdr_utils.hpp"
 
+#include <config.h>
 #include <stdint.h>
 
 namespace pldm
@@ -15,8 +16,6 @@
 {
 
 constexpr uint8_t BmcMctpEid = 8;
-constexpr uint8_t BmcPldmTerminusHandle = 1;
-constexpr uint8_t BmcTerminusId = 1;
 
 /** @brief Build (if not built already) and retrieve PDR by the PDR types
  *
diff --git a/libpldmresponder/pdr_state_effecter.hpp b/libpldmresponder/pdr_state_effecter.hpp
index 7307898..85fb011 100644
--- a/libpldmresponder/pdr_state_effecter.hpp
+++ b/libpldmresponder/pdr_state_effecter.hpp
@@ -5,6 +5,8 @@
 #include "pdr.hpp"
 #include "pdr_utils.hpp"
 
+#include <config.h>
+
 namespace pldm
 {
 
@@ -68,7 +70,7 @@
         pdr->hdr.record_change_num = 0;
         pdr->hdr.length = pdrSize - sizeof(pldm_pdr_hdr);
 
-        pdr->terminus_handle = pdr::BmcPldmTerminusHandle;
+        pdr->terminus_handle = TERMINUS_HANDLE;
         pdr->effecter_id = handler.getNextEffecterId();
 
         try
diff --git a/libpldmresponder/pdr_state_sensor.hpp b/libpldmresponder/pdr_state_sensor.hpp
index a7842df..c80f533 100644
--- a/libpldmresponder/pdr_state_sensor.hpp
+++ b/libpldmresponder/pdr_state_sensor.hpp
@@ -71,7 +71,7 @@
         HTOLE16(pdr->hdr.record_change_num);
         HTOLE16(pdr->hdr.length);
 
-        pdr->terminus_handle = 0;
+        pdr->terminus_handle = TERMINUS_HANDLE;
         pdr->sensor_id = handler.getNextSensorId();
 
         try
diff --git a/libpldmresponder/platform.cpp b/libpldmresponder/platform.cpp
index 1b4c8f5..7c011fa 100644
--- a/libpldmresponder/platform.cpp
+++ b/libpldmresponder/platform.cpp
@@ -1,4 +1,3 @@
-
 #include "platform.hpp"
 
 #include "libpldm/entity.h"
@@ -16,6 +15,8 @@
 #include "platform_state_effecter.hpp"
 #include "platform_state_sensor.hpp"
 
+#include <config.h>
+
 using namespace pldm::utils;
 using namespace pldm::responder::pdr;
 using namespace pldm::responder::pdr_utils;
@@ -596,9 +597,9 @@
     pdr->hdr.type = PLDM_TERMINUS_LOCATOR_PDR;
     pdr->hdr.record_change_num = 0;
     pdr->hdr.length = sizeof(pldm_terminus_locator_pdr) - sizeof(pldm_pdr_hdr);
-    pdr->terminus_handle = BmcPldmTerminusHandle;
+    pdr->terminus_handle = TERMINUS_HANDLE;
     pdr->validity = PLDM_TL_PDR_VALID;
-    pdr->tid = BmcTerminusId;
+    pdr->tid = TERMINUS_ID;
     pdr->container_id = 0x0;
     pdr->terminus_locator_type = PLDM_TERMINUS_LOCATOR_TYPE_MCTP_EID;
     pdr->terminus_locator_value_size =
diff --git a/libpldmresponder/test/libpldmresponder_pdr_effecter_test.cpp b/libpldmresponder/test/libpldmresponder_pdr_effecter_test.cpp
index cefda3a..3b13ab0 100644
--- a/libpldmresponder/test/libpldmresponder_pdr_effecter_test.cpp
+++ b/libpldmresponder/test/libpldmresponder_pdr_effecter_test.cpp
@@ -51,7 +51,7 @@
     ASSERT_EQ(pdr->hdr.record_change_num, 0);
     ASSERT_EQ(pdr->hdr.length, 23);
 
-    ASSERT_EQ(pdr->terminus_handle, BmcPldmTerminusHandle);
+    ASSERT_EQ(pdr->terminus_handle, TERMINUS_HANDLE);
     ASSERT_EQ(pdr->effecter_id, 1);
     ASSERT_EQ(pdr->entity_type, 33);
     ASSERT_EQ(pdr->entity_instance, 0);
@@ -83,7 +83,7 @@
     ASSERT_EQ(pdr->hdr.record_change_num, 0);
     ASSERT_EQ(pdr->hdr.length, 24);
 
-    ASSERT_EQ(pdr->terminus_handle, BmcPldmTerminusHandle);
+    ASSERT_EQ(pdr->terminus_handle, TERMINUS_HANDLE);
     ASSERT_EQ(pdr->effecter_id, 2);
     ASSERT_EQ(pdr->entity_type, 100);
     ASSERT_EQ(pdr->entity_instance, 0);
diff --git a/libpldmresponder/test/libpldmresponder_platform_test.cpp b/libpldmresponder/test/libpldmresponder_platform_test.cpp
index 0fb88a1..10082a6 100644
--- a/libpldmresponder/test/libpldmresponder_platform_test.cpp
+++ b/libpldmresponder/test/libpldmresponder_platform_test.cpp
@@ -566,9 +566,9 @@
     EXPECT_EQ(pdr->hdr.record_change_num, 0);
     EXPECT_EQ(pdr->hdr.length,
               sizeof(pldm_terminus_locator_pdr) - sizeof(pldm_pdr_hdr));
-    EXPECT_EQ(pdr->terminus_handle, BmcPldmTerminusHandle);
+    EXPECT_EQ(pdr->terminus_handle, TERMINUS_HANDLE);
     EXPECT_EQ(pdr->validity, PLDM_TL_PDR_VALID);
-    EXPECT_EQ(pdr->tid, BmcTerminusId);
+    EXPECT_EQ(pdr->tid, TERMINUS_ID);
     EXPECT_EQ(pdr->container_id, 0);
     EXPECT_EQ(pdr->terminus_locator_type, PLDM_TERMINUS_LOCATOR_TYPE_MCTP_EID);
     EXPECT_EQ(pdr->terminus_locator_value_size,