diff --git a/cmake/setup_platform_flags.cmake b/cmake/setup_platform_flags.cmake
index fba10d3594..afe660ebfb 100644
--- a/cmake/setup_platform_flags.cmake
+++ b/cmake/setup_platform_flags.cmake
@@ -253,8 +253,8 @@ if(SUPPORT_XE2_HPG_CORE)
   if(SUPPORT_BMG)
     ADD_AOT_DEFINITION(XE2_HPG)
     ADD_AOT_DEFINITION(BMG)
-    set(BMG_XE2_HPG_CORE_REVISIONS 4)
-    set(BMG_XE2_HPG_CORE_RELEASES "20.1.0" "20.1.1" "20.1.4")
+    set(BMG_XE2_HPG_CORE_REVISIONS 0)
+    set(BMG_XE2_HPG_CORE_RELEASES "20.1.0")
     ADD_PRODUCT("SUPPORTED" "BMG" "IGFX_BMG")
     ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "XE2_HPG_CORE" "BMG")
     ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "XE2_HPG_CORE" "BMG")
diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index c86d4d46db..c8a3df169b 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -36,7 +36,7 @@ components:
     dest_dir: kernels_bin
     type: git
     branch: kernels_bin
-    revision: 3145-2893
+    revision: 3145-2896
   kmdaf:
     branch: kmdaf
     dest_dir: kmdaf
diff --git a/shared/source/xe2_hpg_core/enable_compiler_product_helper_bmg.cpp b/shared/source/xe2_hpg_core/enable_compiler_product_helper_bmg.cpp
index b18f2292be..0cc96af253 100644
--- a/shared/source/xe2_hpg_core/enable_compiler_product_helper_bmg.cpp
+++ b/shared/source/xe2_hpg_core/enable_compiler_product_helper_bmg.cpp
@@ -19,7 +19,7 @@
 namespace NEO {
 template <>
 uint32_t CompilerProductHelperHw<IGFX_BMG>::getDefaultHwIpVersion() const {
-    return AOT::BMG_G21_B0;
+    return AOT::BMG_G21_A0;
 }
 
 template <>
diff --git a/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp b/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp
index 5ce49c3733..8261c22868 100644
--- a/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp
+++ b/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp
@@ -85,8 +85,8 @@ BMGTEST_F(BmgProductHelper, givenProductHelperWhenAdditionalKernelExecInfoSuppor
     EXPECT_TRUE(fePropertiesSupport.disableOverdispatch);
 }
 
-BMGTEST_F(BmgProductHelper, givenCompilerProductHelperWhenGetDefaultHwIpVersionThenCorrectValueIsSet) {
-    EXPECT_EQ(compilerProductHelper->getDefaultHwIpVersion(), AOT::BMG_G21_B0);
+BMGTEST_F(BmgProductHelper, givenCompilerProductHelperWhenGetDefaultHwIpVersonThenCorrectValueIsSet) {
+    EXPECT_EQ(compilerProductHelper->getDefaultHwIpVersion(), AOT::BMG_G21_A0);
 }
 
 BMGTEST_F(BmgProductHelper, givenCompilerProductHelperWhenGetMidThreadPreemptionSupportThenCorrectValueIsSet) {
diff --git a/target_unit_tests/xe2_hpg_core/bmg/CMakeLists.txt b/target_unit_tests/xe2_hpg_core/bmg/CMakeLists.txt
index 5e9e780233..32540f68f9 100644
--- a/target_unit_tests/xe2_hpg_core/bmg/CMakeLists.txt
+++ b/target_unit_tests/xe2_hpg_core/bmg/CMakeLists.txt
@@ -5,6 +5,6 @@
 #
 
 if(TESTS_BMG)
-  set(unit_test_config "bmg/2/4/8/4")
+  set(unit_test_config "bmg/2/4/8/0")
   include(${NEO_SOURCE_DIR}/cmake/run_ult_target.cmake)
 endif()