diff --git a/hypervisor/arch/x86/Kconfig b/hypervisor/arch/x86/Kconfig
index 512baa09a..e3f1d9064 100644
--- a/hypervisor/arch/x86/Kconfig
+++ b/hypervisor/arch/x86/Kconfig
@@ -63,11 +63,6 @@ config MAX_VCPUS_PER_VM
 	  The maximum number of virtual CPUs the hypervisor can support in a
 	  single VM.
 
-config MAX_PCPU_NUM
-	int "Maximum number of PCPU"
-	range 1 8
-	default 8
-
 config MAX_EMULATED_MMIO_REGIONS
 	int "Maximum number of emulated MMIO regions"
 	range 0 128
diff --git a/hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h b/hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h
index 5dbe607af..297603bc2 100644
--- a/hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h
+++ b/hypervisor/arch/x86/configs/apl-mrb/misc_cfg.h
@@ -7,6 +7,7 @@
 #ifndef MISC_CFG_H
 #define MISC_CFG_H
 
+#define CONFIG_MAX_PCPU_NUM	4U
 #define ROOTFS_0		"root=/dev/sda3 "
 #define ROOTFS_1		"root=/dev/mmcblk1p1 "
 
diff --git a/hypervisor/arch/x86/configs/apl-up2/misc_cfg.h b/hypervisor/arch/x86/configs/apl-up2/misc_cfg.h
index 0b2bca85a..859920058 100644
--- a/hypervisor/arch/x86/configs/apl-up2/misc_cfg.h
+++ b/hypervisor/arch/x86/configs/apl-up2/misc_cfg.h
@@ -7,6 +7,7 @@
 #ifndef MISC_CFG_H
 #define MISC_CFG_H
 
+#define CONFIG_MAX_PCPU_NUM	4U
 #define ROOTFS_0		"root=/dev/sda3 "
 #define ROOTFS_1		"root=/dev/mmcblk0p3 "
 
diff --git a/hypervisor/arch/x86/configs/dnv-cb2/misc_cfg.h b/hypervisor/arch/x86/configs/dnv-cb2/misc_cfg.h
index 3c8cb12da..8bc0dd240 100644
--- a/hypervisor/arch/x86/configs/dnv-cb2/misc_cfg.h
+++ b/hypervisor/arch/x86/configs/dnv-cb2/misc_cfg.h
@@ -7,6 +7,7 @@
 #ifndef MISC_CFG_H
 #define MISC_CFG_H
 
+#define CONFIG_MAX_PCPU_NUM	8U
 #define ROOTFS_0		"root=/dev/sda3 "
 
 #define SOS_ROOTFS		ROOTFS_0
diff --git a/hypervisor/arch/x86/configs/generic/misc_cfg.h b/hypervisor/arch/x86/configs/generic/misc_cfg.h
index f0e8ff1d4..484e324f4 100644
--- a/hypervisor/arch/x86/configs/generic/misc_cfg.h
+++ b/hypervisor/arch/x86/configs/generic/misc_cfg.h
@@ -7,6 +7,7 @@
 #ifndef MISC_CFG_H
 #define MISC_CFG_H
 
+#define CONFIG_MAX_PCPU_NUM	4U
 #define ROOTFS_0		"root=/dev/sda3 "
 #define ROOTFS_1		"root=/dev/mmcblk0p1 "
 
diff --git a/hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h b/hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h
index 3c8cb12da..5482a2caf 100644
--- a/hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h
+++ b/hypervisor/arch/x86/configs/nuc6cayh/misc_cfg.h
@@ -7,6 +7,7 @@
 #ifndef MISC_CFG_H
 #define MISC_CFG_H
 
+#define CONFIG_MAX_PCPU_NUM	4U
 #define ROOTFS_0		"root=/dev/sda3 "
 
 #define SOS_ROOTFS		ROOTFS_0
diff --git a/hypervisor/arch/x86/configs/nuc7i7dnb/misc_cfg.h b/hypervisor/arch/x86/configs/nuc7i7dnb/misc_cfg.h
index 44260c5a0..1665273b3 100644
--- a/hypervisor/arch/x86/configs/nuc7i7dnb/misc_cfg.h
+++ b/hypervisor/arch/x86/configs/nuc7i7dnb/misc_cfg.h
@@ -7,6 +7,7 @@
 #ifndef MISC_CFG_H
 #define MISC_CFG_H
 
+#define CONFIG_MAX_PCPU_NUM	4U
 #define ROOTFS_0		"root=/dev/sda3 "
 #define ROOTFS_1		"root=/dev/nvme0n1p3 "