diff --git a/internal/pkg/common/interfaces.go b/internal/pkg/common/interfaces.go
index e1cc2ec..ed8cf1e 100755
--- a/internal/pkg/common/interfaces.go
+++ b/internal/pkg/common/interfaces.go
@@ -131,6 +131,7 @@
 	GetOnuDB() *devdb.OnuDeviceDB
 	GetPersSerialNumber() string
 	GetPersVendorID() string
+	GetPersVersion() string
 	GetPersEquipmentID() string
 	GetPersIsExtOmciSupported() bool
 
diff --git a/internal/pkg/mib/onu_device_entry.go b/internal/pkg/mib/onu_device_entry.go
index 2ebad75..ff12c1c 100755
--- a/internal/pkg/mib/onu_device_entry.go
+++ b/internal/pkg/mib/onu_device_entry.go
@@ -877,7 +877,8 @@
 func (oo *OnuDeviceEntry) buildMibTemplatePath() string {
 	oo.MutexPersOnuConfig.RLock()
 	defer oo.MutexPersOnuConfig.RUnlock()
-	return fmt.Sprintf(cSuffixMibTemplateKvStore, oo.SOnuPersistentData.PersVendorID, oo.SOnuPersistentData.PersEquipmentID, oo.SOnuPersistentData.PersActiveSwVersion)
+	return fmt.Sprintf(cSuffixMibTemplateKvStore, oo.SOnuPersistentData.PersVendorID, oo.SOnuPersistentData.PersVersion,
+		oo.SOnuPersistentData.PersActiveSwVersion)
 }
 
 // AllocateFreeTcont - TODO: add comment
@@ -954,6 +955,14 @@
 	return value
 }
 
+// GetPersVersion - TODO: add comment
+func (oo *OnuDeviceEntry) GetPersVersion() string {
+	oo.MutexPersOnuConfig.RLock()
+	defer oo.MutexPersOnuConfig.RUnlock()
+	value := oo.SOnuPersistentData.PersVersion
+	return value
+}
+
 // GetPersEquipmentID - TODO: add comment
 func (oo *OnuDeviceEntry) GetPersEquipmentID() string {
 	oo.MutexPersOnuConfig.RLock()
diff --git a/internal/pkg/pmmgr/onu_metrics_manager.go b/internal/pkg/pmmgr/onu_metrics_manager.go
index 0d61c2d..242e38c 100755
--- a/internal/pkg/pmmgr/onu_metrics_manager.go
+++ b/internal/pkg/pmmgr/onu_metrics_manager.go
@@ -3094,7 +3094,7 @@
 	// Check if the data is already available in KV store, if yes, do not send the request for get me.
 	var data me.ClassID
 	key := fmt.Sprintf("%s/%s/%s", mm.pOnuDeviceEntry.GetPersVendorID(),
-		mm.pOnuDeviceEntry.GetPersEquipmentID(),
+		mm.pOnuDeviceEntry.GetPersVersion(),
 		mm.pOnuDeviceEntry.GetPersActiveSwVersion())
 	Value, err := mm.extPmKvStore.Get(ctx, key)
 	if err == nil {
@@ -3199,7 +3199,7 @@
 
 func (mm *OnuMetricsManager) putExtPmMeKvStore(ctx context.Context) {
 	key := fmt.Sprintf("%s/%s/%s", mm.pOnuDeviceEntry.GetPersVendorID(),
-		mm.pOnuDeviceEntry.GetPersEquipmentID(),
+		mm.pOnuDeviceEntry.GetPersVersion(),
 		mm.pOnuDeviceEntry.GetPersActiveSwVersion())
 	// check if we get the supported type me for ethernet frame extended pm class id
 	if mm.supportedEthernetFrameExtendedPMClass == 0 {