diff --git a/shared/source/enable_gens.cmake b/shared/source/enable_gens.cmake
index a02c2e43ef..017828fc39 100644
--- a/shared/source/enable_gens.cmake
+++ b/shared/source/enable_gens.cmake
@@ -47,6 +47,10 @@ macro(macro_for_each_platform)
       if(EXISTS ${SRC_FILE})
         list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX ${SRC_FILE})
       endif()
+      set(SRC_FILE "${CORE_GENX_PREFIX}/os_agnostic_hw_info_config_${PLATFORM_IT_LOWER}.inl")
+      if(EXISTS ${SRC_FILE})
+        list(APPEND CORE_SRCS_${GEN_TYPE}_H_BASE ${SRC_FILE})
+      endif()
     endforeach()
   endforeach()
 
@@ -93,6 +97,11 @@ macro(macro_for_each_gen)
         endif()
       endforeach()
 
+      set(SRC_FILE "${CORE_GENX_PREFIX}/os_agnostic_hw_info_config_${GEN_TYPE_LOWER}.inl")
+      if(EXISTS ${SRC_FILE})
+        list(APPEND CORE_SRCS_${GEN_TYPE}_H_BASE ${SRC_FILE})
+      endif()
+
       if(EXISTS ${CORE_GENX_PREFIX}${BRANCH_DIR}windows/hw_info_config_${GEN_TYPE_LOWER}${_BRANCH_FILENAME_SUFFIX}.cpp)
         list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_WINDOWS ${CORE_GENX_PREFIX}${BRANCH_DIR}windows/hw_info_config_${GEN_TYPE_LOWER}${_BRANCH_FILENAME_SUFFIX}.cpp)
       endif()
diff --git a/shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl b/shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl
index e747d1fd15..d279c46190 100644
--- a/shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl
+++ b/shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl
@@ -11,5 +11,5 @@ template <>
 bool HwInfoConfigHw<IGFX_XE_HP_SDV>::isMaxThreadsForWorkgroupWARequired(const HardwareInfo &hwInfo) const {
     auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
     uint32_t stepping = hwHelper.getSteppingFromHwRevId(hwInfo);
-    return REVISION_A0 == stepping;
+    return REVISION_B > stepping;
 }
\ No newline at end of file