diff --git a/Makefile b/Makefile
index 325d7854e..0c2ed31eb 100644
--- a/Makefile
+++ b/Makefile
@@ -160,11 +160,6 @@ hypervisor:
 	fi
 	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) clean;
 	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) TARGET_DIR=$(abspath $(TARGET_DIR)) defconfig;
-	@if [ "$(CONFIG_XML_ENABLED)" != "true" ] && [ ! -f $(KCONFIG_FILE) ]; then \
-		if [ "$(SCENARIO)" != "sdc" ]; then \
-			echo "CONFIG_MAX_KATA_VM_NUM=0" >> $(HV_OUT)/.config; \
-		fi; \
-	fi; \
 	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) TARGET_DIR=$(abspath $(TARGET_DIR)) oldconfig;
 	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) TARGET_DIR=$(abspath $(TARGET_DIR))
 #ifeq ($(FIRMWARE),uefi)
diff --git a/hypervisor/arch/x86/Kconfig b/hypervisor/arch/x86/Kconfig
index 1a6927191..58e1b6924 100644
--- a/hypervisor/arch/x86/Kconfig
+++ b/hypervisor/arch/x86/Kconfig
@@ -312,12 +312,6 @@ config L1D_FLUSH_VMENTRY_ENABLED
 	bool "Enable L1 cache flush before VM entry"
 	default n
 
-config MAX_KATA_VM_NUM
-	int "Maximum number of Kata Containers in SOS"
-	range 0 1
-	default 1 if SDC
-	default 0 if !SDC
-
 config UEFI_OS_LOADER_NAME
 	string "UEFI OS loader name"
 	default "\\EFI\\org.clearlinux\\bootloaderx64.efi"
diff --git a/hypervisor/scenarios/hybrid/vm_configurations.h b/hypervisor/scenarios/hybrid/vm_configurations.h
index 2a4340b92..c1828cab7 100644
--- a/hypervisor/scenarios/hybrid/vm_configurations.h
+++ b/hypervisor/scenarios/hybrid/vm_configurations.h
@@ -20,6 +20,7 @@
 #define PRE_VM_NUM			1U
 #define SOS_VM_NUM			1U
 #define MAX_POST_VM_NUM			1U
+#define CONFIG_MAX_KATA_VM_NUM		0U
 
 #define VM0_CONFIG_VCPU_AFFINITY	{AFFINITY_CPU(3U)}
 #define VM0_CONFIG_MEM_START_HPA	0x100000000UL
diff --git a/hypervisor/scenarios/industry/vm_configurations.h b/hypervisor/scenarios/industry/vm_configurations.h
index 430d40001..4c03945e7 100644
--- a/hypervisor/scenarios/industry/vm_configurations.h
+++ b/hypervisor/scenarios/industry/vm_configurations.h
@@ -16,6 +16,7 @@
 #define PRE_VM_NUM			0U
 #define SOS_VM_NUM			1U
 #define MAX_POST_VM_NUM			2U
+#define CONFIG_MAX_KATA_VM_NUM		0U
 
 /* Bits mask of guest flags that can be programmed by device model. Other bits are set by hypervisor only */
 #define DM_OWNED_GUEST_FLAG_MASK	(GUEST_FLAG_SECURE_WORLD_ENABLED | GUEST_FLAG_LAPIC_PASSTHROUGH | \
diff --git a/hypervisor/scenarios/logical_partition/vm_configurations.h b/hypervisor/scenarios/logical_partition/vm_configurations.h
index fdb4ec7be..2b62cd8c6 100644
--- a/hypervisor/scenarios/logical_partition/vm_configurations.h
+++ b/hypervisor/scenarios/logical_partition/vm_configurations.h
@@ -20,6 +20,7 @@
 #define PRE_VM_NUM			2U
 #define SOS_VM_NUM			0U
 #define MAX_POST_VM_NUM			0U
+#define CONFIG_MAX_KATA_VM_NUM		0U
 
 /* The VM CONFIGs like:
  *	VMX_CONFIG_VCPU_AFFINITY
diff --git a/hypervisor/scenarios/sdc/vm_configurations.h b/hypervisor/scenarios/sdc/vm_configurations.h
index 91b1dbd75..91ece3636 100644
--- a/hypervisor/scenarios/sdc/vm_configurations.h
+++ b/hypervisor/scenarios/sdc/vm_configurations.h
@@ -16,6 +16,7 @@
 #define PRE_VM_NUM			0U
 #define SOS_VM_NUM			1U
 #define MAX_POST_VM_NUM			2U	/* including 1 KATA VM */
+#define CONFIG_MAX_KATA_VM_NUM		1U
 
 /* Bits mask of guest flags that can be programmed by device model. Other bits are set by hypervisor only */
 #define DM_OWNED_GUEST_FLAG_MASK	(GUEST_FLAG_SECURE_WORLD_ENABLED | GUEST_FLAG_LAPIC_PASSTHROUGH | \
diff --git a/hypervisor/scenarios/sdc2/vm_configurations.h b/hypervisor/scenarios/sdc2/vm_configurations.h
index d5bc956b7..ad66c7bf4 100644
--- a/hypervisor/scenarios/sdc2/vm_configurations.h
+++ b/hypervisor/scenarios/sdc2/vm_configurations.h
@@ -16,6 +16,7 @@
 #define PRE_VM_NUM			0U
 #define SOS_VM_NUM			1U
 #define MAX_POST_VM_NUM			3U
+#define CONFIG_MAX_KATA_VM_NUM		0U
 
 /* Bits mask of guest flags that can be programmed by device model. Other bits are set by hypervisor only */
 #define DM_OWNED_GUEST_FLAG_MASK	(GUEST_FLAG_SECURE_WORLD_ENABLED | GUEST_FLAG_LAPIC_PASSTHROUGH | \