diff --git a/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H b/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H
index ffaf0bb251a..73025e27622 100644
--- a/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H
+++ b/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H
@@ -66,6 +66,7 @@ namespace p9_hcodeImageBuild
  */
 
 #define MAX_HOMER_QUAD_CMN_RINGS       (uint32_t)(EQ::g_eqData.iv_num_common_rings - 4)
+#define MAX_HOMER_CORE_CMN_RINGS       (uint32_t)(EC::g_ecData.iv_num_common_rings - 2)
 
 /**
  * @brief models QPMR header in HOMER
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C b/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C
index 7d0ec6431d0..c70138ee714 100644
--- a/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C
@@ -2139,7 +2139,7 @@ uint32_t layoutCmnRingsForCme( Homerlayout_t*   i_pHomer,
             break;
         }
 
-        for( uint32_t ringIndex = 0; ringIndex < EC::g_ecData.iv_num_common_rings;
+        for( uint32_t ringIndex = 0; ringIndex < MAX_HOMER_CORE_CMN_RINGS;
              ringIndex++ )
         {
             ringSize = i_ringData.iv_sizeWorkBuf1;
@@ -2395,7 +2395,7 @@ uint32_t layoutCmeScanOverride( Homerlayout_t*   i_pHomer,
         uint8_t* pOverrideRingPayload = pOverrideStart + CORE_COMMON_RING_INDEX_SIZE;
         bool overrideNotFound = true;
 
-        for( uint8_t ringIndex = 0; ringIndex < EC::g_ecData.iv_num_common_rings;
+        for( uint8_t ringIndex = 0; ringIndex < MAX_HOMER_CORE_CMN_RINGS;
              ringIndex++ )
         {
             tempBufSize = i_ringData.iv_sizeWorkBuf2;
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C b/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C
index 83fc7e7727e..aba895c589a 100644
--- a/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C
@@ -386,7 +386,7 @@ RingBucket::RingBucket( PlatId i_plat, uint8_t* i_pRingStart, RingDebugMode_t i_
             { ec_repr, 23 },
         };
 
-        for( ringIndex = 0; ringIndex < EC::g_ecData.iv_num_common_rings; ringIndex++ )
+        for( ringIndex = 0; ringIndex < MAX_HOMER_CORE_CMN_RINGS; ringIndex++ )
         {
             iv_cmnRingMap[ringIndex] = l_coreCmnRings[ringIndex];
         }