diff --git a/cmake/fill_core_types.cmake b/cmake/fill_core_types.cmake
index a36ad97057..cb08490d82 100644
--- a/cmake/fill_core_types.cmake
+++ b/cmake/fill_core_types.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2022 Intel Corporation
+# Copyright (C) 2020-2024 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -11,7 +11,7 @@ list(APPEND ALL_CORE_TYPES "GEN12LP")
 list(APPEND ALL_CORE_TYPES "XE_HP_CORE")
 list(APPEND ALL_CORE_TYPES "XE_HPG_CORE")
 list(APPEND ALL_CORE_TYPES "XE_HPC_CORE")
-list(APPEND XEHP_AND_LATER_CORE_TYPES "XE_HP_CORE" "XE_HPG_CORE" "XE_HPC_CORE")
-list(APPEND DG2_AND_LATER_CORE_TYPES "XE_HPG_CORE" "XE_HPC_CORE")
-list(APPEND MTL_AND_LATER_CORE_TYPES "XE_HPG_CORE" "XE_HPC_CORE")
 list(APPEND PVC_AND_LATER_CORE_TYPES "XE_HPC_CORE")
+list(APPEND DG2_AND_LATER_CORE_TYPES ${PVC_AND_LATER_CORE_TYPES} "XE_HPG_CORE")
+list(APPEND MTL_AND_LATER_CORE_TYPES ${DG2_AND_LATER_CORE_TYPES})
+list(APPEND XEHP_AND_LATER_CORE_TYPES ${MTL_AND_LATER_CORE_TYPES})