diff --git a/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp b/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp
index 44aee252e9..f389f27131 100644
--- a/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp
+++ b/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp
@@ -163,6 +163,12 @@ void MultipleDevicesWithCustomHwInfo::setUp() {
     hwInfo = *NEO::defaultHwInfo.get();
 
     hwInfo.gtSystemInfo.SliceCount = sliceCount;
+    for (uint32_t slice = 0; slice < sliceCount; slice++) {
+        hwInfo.gtSystemInfo.SliceInfo[slice].Enabled = true;
+    }
+    for (uint32_t slice = sliceCount; slice < GT_MAX_SLICE; slice++) {
+        hwInfo.gtSystemInfo.SliceInfo[slice].Enabled = false;
+    }
     hwInfo.gtSystemInfo.SubSliceCount = subsliceCount;
     hwInfo.gtSystemInfo.EUCount = subsliceCount * numEuPerSubslice;
     hwInfo.gtSystemInfo.ThreadCount = subsliceCount * numEuPerSubslice * numThreadsPerEu;
diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index 5a7e238424..17df4a618e 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -42,7 +42,7 @@ components:
     dest_dir: kernels_bin
     type: git
     branch: kernels_bin
-    revision: 2073-791
+    revision: 2073-798
   kmdaf:
     branch: kmdaf
     dest_dir: kmdaf
diff --git a/opencl/test/unit_test/xe_hpg_core/mtl/linux/dll/CMakeLists.txt b/opencl/test/unit_test/xe_hpg_core/mtl/linux/dll/CMakeLists.txt
index 8f36021dc5..1e6f70b3d5 100644
--- a/opencl/test/unit_test/xe_hpg_core/mtl/linux/dll/CMakeLists.txt
+++ b/opencl/test/unit_test/xe_hpg_core/mtl/linux/dll/CMakeLists.txt
@@ -1,11 +1,11 @@
 #
-# Copyright (C) 2022 Intel Corporation
+# Copyright (C) 2022-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(IGDRCL_SRCS_linux_dll_tests_xe_hpg_core_mtl
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/${BRANCH_DIR_SUFFIX}/device_id_tests_mtl.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/device_id_tests_mtl.cpp
 )
 target_sources(igdrcl_linux_dll_tests PRIVATE ${IGDRCL_SRCS_linux_dll_tests_xe_hpg_core_mtl})
diff --git a/shared/source/dll/devices/devices_additional.inl b/shared/source/dll/devices/devices_additional.inl
index 97fb18fc4e..6841591cb0 100644
--- a/shared/source/dll/devices/devices_additional.inl
+++ b/shared/source/dll/devices/devices_additional.inl
@@ -18,13 +18,3 @@ NAMEDDEVICE(0x0BDB, PvcHwConfig, "Intel(R) Data Center GPU Max 1100")
 NAMEDDEVICE(0x0B69, PvcHwConfig, "Intel(R) Data Center GPU Max 1450")
 #endif
 #endif
-
-#ifdef SUPPORT_XE_HPG_CORE
-#ifdef SUPPORT_MTL
-DEVICE(0x7D40, MtlHwConfig)
-DEVICE(0x7D55, MtlHwConfig)
-DEVICE(0x7DD5, MtlHwConfig)
-DEVICE(0x7D45, MtlHwConfig)
-DEVICE(0x7D60, MtlHwConfig)
-#endif
-#endif
diff --git a/shared/source/dll/devices/devices_base.inl b/shared/source/dll/devices/devices_base.inl
index fbc79ab892..469ec26e18 100644
--- a/shared/source/dll/devices/devices_base.inl
+++ b/shared/source/dll/devices/devices_base.inl
@@ -38,6 +38,13 @@ NAMEDDEVICE(0x56A6, Dg2HwConfig, "Intel(R) Arc(TM) A310 Graphics")
 NAMEDDEVICE(0x56C0, Dg2HwConfig, "Intel(R) Data Center GPU Flex 170")
 NAMEDDEVICE(0x56C1, Dg2HwConfig, "Intel(R) Data Center GPU Flex 140")
 #endif
+#ifdef SUPPORT_MTL
+DEVICE(0x7D40, MtlHwConfig)
+DEVICE(0x7D55, MtlHwConfig)
+DEVICE(0x7DD5, MtlHwConfig)
+DEVICE(0x7D45, MtlHwConfig)
+DEVICE(0x7D60, MtlHwConfig)
+#endif
 #endif
 
 #ifdef SUPPORT_XE_HP_CORE
diff --git a/shared/source/helpers/compiler_product_helper_base.inl b/shared/source/helpers/compiler_product_helper_base.inl
index e85351eccb..0d42518c5a 100644
--- a/shared/source/helpers/compiler_product_helper_base.inl
+++ b/shared/source/helpers/compiler_product_helper_base.inl
@@ -20,6 +20,11 @@ bool CompilerProductHelperHw<gfxProduct>::isForceEmuInt32DivRemSPRequired() cons
     return false;
 }
 
+template <PRODUCT_FAMILY gfxProduct>
+uint64_t CompilerProductHelperHw<gfxProduct>::getHwInfoConfig(const HardwareInfo &hwInfo) const {
+    return 0x0;
+}
+
 template <PRODUCT_FAMILY gfxProduct>
 bool CompilerProductHelperHw<gfxProduct>::isStatelessToStatefulBufferOffsetSupported() const {
     return true;
diff --git a/shared/source/xe_hpg_core/definitions/compiler_product_helper_mtl.inl b/shared/source/xe_hpg_core/definitions/compiler_product_helper_mtl.inl
deleted file mode 100644
index fc69aeaa65..0000000000
--- a/shared/source/xe_hpg_core/definitions/compiler_product_helper_mtl.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) 2023 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-namespace NEO {
-template <>
-uint64_t CompilerProductHelperHw<IGFX_METEORLAKE>::getHwInfoConfig(const HardwareInfo &hwInfo) const {
-    return 0x0;
-}
-
-} // namespace NEO
diff --git a/shared/source/xe_hpg_core/definitions/hw_cmds_mtl.inl b/shared/source/xe_hpg_core/definitions/hw_cmds_mtl.inl
deleted file mode 100644
index 9b9ddd4799..0000000000
--- a/shared/source/xe_hpg_core/definitions/hw_cmds_mtl.inl
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * Copyright (C) 2022 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
diff --git a/shared/source/xe_hpg_core/definitions/hw_info_setup_mtl.inl b/shared/source/xe_hpg_core/definitions/hw_info_setup_mtl.inl
deleted file mode 100644
index b03b65fb7f..0000000000
--- a/shared/source/xe_hpg_core/definitions/hw_info_setup_mtl.inl
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2022-2023 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-namespace NEO {
-const HardwareInfo MTL::hwInfo = MtlHwConfig::hwInfo;
-
-void setupMTLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig, const CompilerProductHelper &compilerProductHelper) {
-    MTL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper);
-    MtlHwConfig::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper);
-}
-
-void (*MTL::setupHardwareInfo)(HardwareInfo *, bool, uint64_t, const CompilerProductHelper &) = setupMTLHardwareInfoImpl;
-} // namespace NEO
diff --git a/shared/source/xe_hpg_core/enable_compiler_product_helper_mtl.cpp b/shared/source/xe_hpg_core/enable_compiler_product_helper_mtl.cpp
index f24acb2089..08d37962e7 100644
--- a/shared/source/xe_hpg_core/enable_compiler_product_helper_mtl.cpp
+++ b/shared/source/xe_hpg_core/enable_compiler_product_helper_mtl.cpp
@@ -15,7 +15,6 @@
 #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl"
 #include "shared/source/xe_hpg_core/hw_cmds_mtl.h"
 
-#include "compiler_product_helper_mtl.inl"
 #include "platforms.h"
 
 constexpr auto gfxProduct = IGFX_METEORLAKE;
diff --git a/shared/source/xe_hpg_core/hw_cmds_mtl.h b/shared/source/xe_hpg_core/hw_cmds_mtl.h
index bc00c81407..0e213f1649 100644
--- a/shared/source/xe_hpg_core/hw_cmds_mtl.h
+++ b/shared/source/xe_hpg_core/hw_cmds_mtl.h
@@ -25,7 +25,6 @@ struct MTL : public XeHpgCoreFamily {
     static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig, const CompilerProductHelper &compilerProductHelper);
     static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper);
-    static void setupHardwareInfoMultiTileBase(HardwareInfo *hwInfo);
 };
 
 class MtlHwConfig : public MTL {
@@ -37,5 +36,4 @@ class MtlHwConfig : public MTL {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-#include "hw_cmds_mtl.inl"
 } // namespace NEO
diff --git a/shared/source/xe_hpg_core/hw_info_mtl.cpp b/shared/source/xe_hpg_core/hw_info_mtl.cpp
index e142601df4..825a281673 100644
--- a/shared/source/xe_hpg_core/hw_info_mtl.cpp
+++ b/shared/source/xe_hpg_core/hw_info_mtl.cpp
@@ -138,11 +138,6 @@ void MTL::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     }
 }
 
-void MTL::setupHardwareInfoMultiTileBase(HardwareInfo *hwInfo) {
-    GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
-    gtSysInfo->MultiTileArchInfo.IsValid = false;
-}
-
 const HardwareInfo MtlHwConfig::hwInfo = {
     &MTL::platform,
     &MTL::featureTable,
@@ -152,6 +147,7 @@ const HardwareInfo MtlHwConfig::hwInfo = {
 
 GT_SYSTEM_INFO MtlHwConfig::gtSystemInfo = {0};
 void MtlHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) {
+    MTL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper);
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
     gtSysInfo->CsrSizeInMb = 8;
     gtSysInfo->IsL3HashModeEnabled = false;
@@ -167,23 +163,26 @@ void MtlHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTable
         gtSysInfo->MaxSlicesSupported = gtSysInfo->SliceCount;
         gtSysInfo->MaxSubSlicesSupported = gtSysInfo->SubSliceCount;
 
-        gtSysInfo->L3CacheSizeInKb = 1;
         gtSysInfo->L3BankCount = 1;
 
-        gtSysInfo->CCSInfo.IsValid = true;
-        gtSysInfo->CCSInfo.NumberOfCCSEnabled = 1;
-
         hwInfo->featureTable.ftrBcsInfo = 1;
         gtSysInfo->IsDynamicallyPopulated = true;
         for (uint32_t slice = 0; slice < gtSysInfo->SliceCount; slice++) {
             gtSysInfo->SliceInfo[slice].Enabled = true;
         }
     }
+    gtSysInfo->L3CacheSizeInKb = 1;
 
     if (setupFeatureTableAndWorkaroundTable) {
         MTL::setupFeatureAndWorkaroundTable(hwInfo);
     }
 };
 
+const HardwareInfo MTL::hwInfo = MtlHwConfig::hwInfo;
+
+void setupMTLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig, const CompilerProductHelper &compilerProductHelper) {
+    MtlHwConfig::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper);
+}
+
+void (*MTL::setupHardwareInfo)(HardwareInfo *, bool, uint64_t, const CompilerProductHelper &) = setupMTLHardwareInfoImpl;
 } // namespace NEO
-#include "hw_info_setup_mtl.inl"
diff --git a/shared/test/common/tests_configuration.cpp b/shared/test/common/tests_configuration.cpp
index 3953460cba..d70aa7ceaf 100644
--- a/shared/test/common/tests_configuration.cpp
+++ b/shared/test/common/tests_configuration.cpp
@@ -32,6 +32,12 @@ void adjustHwInfoForTests(HardwareInfo &hwInfoForTests, uint32_t euPerSubSlice,
     euPerSubSlice = euPerSubSlice > 0 ? euPerSubSlice : gtSystemInfo.MaxEuPerSubSlice;
 
     gtSystemInfo.SliceCount = sliceCount;
+    for (uint32_t slice = 0; slice < sliceCount; slice++) {
+        gtSystemInfo.SliceInfo[slice].Enabled = true;
+    }
+    for (uint32_t slice = sliceCount; slice < GT_MAX_SLICE; slice++) {
+        gtSystemInfo.SliceInfo[slice].Enabled = false;
+    }
     gtSystemInfo.SubSliceCount = gtSystemInfo.SliceCount * subSlicePerSliceCount;
     gtSystemInfo.DualSubSliceCount = gtSystemInfo.SubSliceCount;
     gtSystemInfo.EUCount = gtSystemInfo.SubSliceCount * euPerSubSlice - dieRecovery;