diff --git a/hypervisor/arch/x86/Kconfig b/hypervisor/arch/x86/Kconfig
index a34a3c25e..fb259167f 100644
--- a/hypervisor/arch/x86/Kconfig
+++ b/hypervisor/arch/x86/Kconfig
@@ -57,15 +57,6 @@ config RELEASE
 	  console and hypervisor shell are available only in non-release
 	  (i.e. debug) builds. Assertions are not effective in release builds.
 
-config MAX_VM_NUM
-	int "Maximum number of VM"
-	range 1 8
-	default 4
-	help
-	  The maximum number of virtual machines (VMs) the hypervisor can
-	  support.  This is customizable per the use cases of the build. For
-	  general-purpose builds the maximum of physical cores can be used.
-
 config MAX_VCPUS_PER_VM
 	int "Maximum number of VCPUs per VM"
 	range 1 8
diff --git a/hypervisor/arch/x86/configs/apl-mrb.config b/hypervisor/arch/x86/configs/apl-mrb.config
index 85bdab064..2a61968ef 100644
--- a/hypervisor/arch/x86/configs/apl-mrb.config
+++ b/hypervisor/arch/x86/configs/apl-mrb.config
@@ -7,6 +7,6 @@ CONFIG_HV_RAM_START=0x6e000000
 CONFIG_HV_RAM_SIZE=0x07800000
 CONFIG_PLATFORM_RAM_SIZE=0x200000000
 CONFIG_SOS_RAM_SIZE=0x200000000
-CONFIG_UOS_RAM_SIZE=0x100000000
+CONFIG_UOS_RAM_SIZE=0x200000000
 CONFIG_DMAR_PARSE_ENABLED=n
 CONFIG_IOMMU_BUS_NUM=0x10
diff --git a/hypervisor/arch/x86/vtd.c b/hypervisor/arch/x86/vtd.c
index 9c283fd7c..3320fe033 100644
--- a/hypervisor/arch/x86/vtd.c
+++ b/hypervisor/arch/x86/vtd.c
@@ -18,6 +18,7 @@
 #include <lapic.h>
 #include <vtd.h>
 #include <logmsg.h>
+#include <vm_configurations.h>
 
 #define DBG_IOMMU 0
 
diff --git a/hypervisor/include/debug/profiling_internal.h b/hypervisor/include/debug/profiling_internal.h
index bc5e052d1..afbca0c2f 100644
--- a/hypervisor/include/debug/profiling_internal.h
+++ b/hypervisor/include/debug/profiling_internal.h
@@ -10,6 +10,7 @@
 #ifdef PROFILING_ON
 
 #include <vcpu.h>
+#include <vm_configurations.h>
 
 #define MAX_MSR_LIST_NUM		15U
 #define MAX_PROFILING_MSR_STORE_NUM	1
diff --git a/hypervisor/scenarios/logical_partition/vm_configurations.h b/hypervisor/scenarios/logical_partition/vm_configurations.h
index f1deea8ed..514b5aa4c 100644
--- a/hypervisor/scenarios/logical_partition/vm_configurations.h
+++ b/hypervisor/scenarios/logical_partition/vm_configurations.h
@@ -7,6 +7,8 @@
 #ifndef VM_CONFIGURATIONS_H
 #define VM_CONFIGURATIONS_H
 
+#define CONFIG_MAX_VM_NUM	2U
+
 /* The VM CONFIGs like:
  *	VMX_CONFIG_PCPU_BITMAP
  *	VMX_CONFIG_MEM_START_HPA
diff --git a/hypervisor/scenarios/sdc/vm_configurations.h b/hypervisor/scenarios/sdc/vm_configurations.h
index 9d5a976d4..6c49865f9 100644
--- a/hypervisor/scenarios/sdc/vm_configurations.h
+++ b/hypervisor/scenarios/sdc/vm_configurations.h
@@ -7,4 +7,6 @@
 #ifndef VM_CONFIGURATIONS_H
 #define VM_CONFIGURATIONS_H
 
+#define CONFIG_MAX_VM_NUM	2U
+
 #endif /* VM_CONFIGURATIONS_H */