diff --git a/hypervisor/include/arch/x86/board.h b/hypervisor/include/arch/x86/board.h
index 932c63f23..a7e5ba1a2 100644
--- a/hypervisor/include/arch/x86/board.h
+++ b/hypervisor/include/arch/x86/board.h
@@ -30,7 +30,7 @@ extern struct dmar_info plat_dmar_info;
 #ifdef CONFIG_RDT_ENABLED
 extern struct platform_clos_info platform_l2_clos_array[MAX_PLATFORM_CLOS_NUM];
 extern struct platform_clos_info platform_l3_clos_array[MAX_PLATFORM_CLOS_NUM];
-extern struct platform_clos_info platform_mba_clos_array[MAX_MBA_CLOS_NUM_ENTRIES];
+extern struct platform_clos_info platform_mba_clos_array[MAX_PLATFORM_CLOS_NUM];
 #endif
 
 extern const struct cpu_state_table board_cpu_state_tbl;
diff --git a/misc/vm_configs/boards/nuc7i7dnb/board.c b/misc/vm_configs/boards/nuc7i7dnb/board.c
index 534293a33..094b305c6 100644
--- a/misc/vm_configs/boards/nuc7i7dnb/board.c
+++ b/misc/vm_configs/boards/nuc7i7dnb/board.c
@@ -73,7 +73,7 @@ struct dmar_info plat_dmar_info = {
 #ifdef CONFIG_RDT_ENABLED
 struct platform_clos_info platform_l2_clos_array[MAX_PLATFORM_CLOS_NUM];
 struct platform_clos_info platform_l3_clos_array[MAX_PLATFORM_CLOS_NUM];
-struct platform_clos_info platform_mba_clos_array[MAX_MBA_CLOS_NUM_ENTRIES];
+struct platform_clos_info platform_mba_clos_array[MAX_PLATFORM_CLOS_NUM];
 #endif
 
 static const struct cpu_cx_data board_cpu_cx[3] = {
diff --git a/misc/vm_configs/boards/nuc7i7dnb/board_info.h b/misc/vm_configs/boards/nuc7i7dnb/board_info.h
index 38c8417e8..d7add73ef 100644
--- a/misc/vm_configs/boards/nuc7i7dnb/board_info.h
+++ b/misc/vm_configs/boards/nuc7i7dnb/board_info.h
@@ -9,7 +9,6 @@
 
 #define MAX_PCPU_NUM			4U
 #define MAX_PLATFORM_CLOS_NUM		0U
-#define MAX_MBA_CLOS_NUM_ENTRIES	0U
 #define MAX_VMSIX_ON_MSI_PDEVS_NUM	0U
 #define MAX_HIDDEN_PDEVS_NUM		0U
 
diff --git a/misc/vm_configs/boards/whl-ipc-i5/board.c b/misc/vm_configs/boards/whl-ipc-i5/board.c
index 1c70957a0..0c50f226e 100644
--- a/misc/vm_configs/boards/whl-ipc-i5/board.c
+++ b/misc/vm_configs/boards/whl-ipc-i5/board.c
@@ -74,7 +74,7 @@ struct dmar_info plat_dmar_info = {
 #ifdef CONFIG_RDT_ENABLED
 struct platform_clos_info platform_l2_clos_array[MAX_PLATFORM_CLOS_NUM];
 struct platform_clos_info platform_l3_clos_array[MAX_PLATFORM_CLOS_NUM];
-struct platform_clos_info platform_mba_clos_array[MAX_MBA_CLOS_NUM_ENTRIES];
+struct platform_clos_info platform_mba_clos_array[MAX_PLATFORM_CLOS_NUM];
 #endif
 
 static const struct cpu_cx_data board_cpu_cx[3] = {
diff --git a/misc/vm_configs/boards/whl-ipc-i5/board_info.h b/misc/vm_configs/boards/whl-ipc-i5/board_info.h
index 38c8417e8..d7add73ef 100644
--- a/misc/vm_configs/boards/whl-ipc-i5/board_info.h
+++ b/misc/vm_configs/boards/whl-ipc-i5/board_info.h
@@ -9,7 +9,6 @@
 
 #define MAX_PCPU_NUM			4U
 #define MAX_PLATFORM_CLOS_NUM		0U
-#define MAX_MBA_CLOS_NUM_ENTRIES	0U
 #define MAX_VMSIX_ON_MSI_PDEVS_NUM	0U
 #define MAX_HIDDEN_PDEVS_NUM		0U
 
diff --git a/misc/vm_configs/boards/whl-ipc-i7/board.c b/misc/vm_configs/boards/whl-ipc-i7/board.c
index c115b71ec..904a53f5a 100644
--- a/misc/vm_configs/boards/whl-ipc-i7/board.c
+++ b/misc/vm_configs/boards/whl-ipc-i7/board.c
@@ -74,7 +74,7 @@ struct dmar_info plat_dmar_info = {
 #ifdef CONFIG_RDT_ENABLED
 struct platform_clos_info platform_l2_clos_array[MAX_PLATFORM_CLOS_NUM];
 struct platform_clos_info platform_l3_clos_array[MAX_PLATFORM_CLOS_NUM];
-struct platform_clos_info platform_mba_clos_array[MAX_MBA_CLOS_NUM_ENTRIES];
+struct platform_clos_info platform_mba_clos_array[MAX_PLATFORM_CLOS_NUM];
 #endif
 
 static const struct cpu_cx_data board_cpu_cx[3] = {
diff --git a/misc/vm_configs/boards/whl-ipc-i7/board_info.h b/misc/vm_configs/boards/whl-ipc-i7/board_info.h
index 38c8417e8..d7add73ef 100644
--- a/misc/vm_configs/boards/whl-ipc-i7/board_info.h
+++ b/misc/vm_configs/boards/whl-ipc-i7/board_info.h
@@ -9,7 +9,6 @@
 
 #define MAX_PCPU_NUM			4U
 #define MAX_PLATFORM_CLOS_NUM		0U
-#define MAX_MBA_CLOS_NUM_ENTRIES	0U
 #define MAX_VMSIX_ON_MSI_PDEVS_NUM	0U
 #define MAX_HIDDEN_PDEVS_NUM		0U