diff --git a/third_party/aot_config_headers/.version b/third_party/aot_config_headers/.version
index aca77948e2..3c76ef0084 100644
--- a/third_party/aot_config_headers/.version
+++ b/third_party/aot_config_headers/.version
@@ -1 +1 @@
-git_revision: 9baa2b4486a43f33d67eec1f05af46bca8ab1266
+git_revision: 74edb43bf6b96f18bd2a95836282303f9d9c0f2a
diff --git a/third_party/aot_config_headers/platforms.h b/third_party/aot_config_headers/platforms.h
index fe64653651..c650a82c1d 100644
--- a/third_party/aot_config_headers/platforms.h
+++ b/third_party/aot_config_headers/platforms.h
@@ -261,9 +261,9 @@ inline const std::map<std::string, PRODUCT_CONFIG> genericIdAcronyms = {
 inline const std::map<PRODUCT_CONFIG, std::vector<PRODUCT_CONFIG>> compatibilityMapping = {
     {DG2_G10_C0, {DG2_G11_B1, DG2_G12_A0}},
     {MTL_U_B0, {MTL_H_B0}},
-    {BMG_G21_A0, {LNL_B0}},
-    {BMG_G21_A1_RESERVED, {BMG_G21_A0, LNL_B0}},
-    {BMG_G21_B0_RESERVED, {BMG_G21_A0, LNL_B0}},
+    {BMG_G21_A0, {BMG_G31_A0, LNL_B0}},
+    {BMG_G21_A1_RESERVED, {BMG_G21_A0, BMG_G31_A0, LNL_B0}},
+    {BMG_G21_B0_RESERVED, {BMG_G21_A0, BMG_G31_A0, LNL_B0}},
     {PTL_H_B0, {PTL_U_A0}},
 };
 } // namespace AOT