diff --git a/kernel/configs/fragments/common/base.conf b/kernel/configs/fragments/common/base.conf
index 76e37b804..8bd72a009 100644
--- a/kernel/configs/fragments/common/base.conf
+++ b/kernel/configs/fragments/common/base.conf
@@ -1,9 +1,7 @@
 # Basic necessary items!
 
 CONFIG_SMP=y
-CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
-CONFIG_KVM_GUEST=y
 # Note, no nested VM support enabled here
 
 # Turn off embedded mode, as it disabled 'too much', and we
diff --git a/kernel/configs/fragments/x86_64/base.conf b/kernel/configs/fragments/x86_64/base.conf
index c59807477..08023e8ca 100644
--- a/kernel/configs/fragments/x86_64/base.conf
+++ b/kernel/configs/fragments/x86_64/base.conf
@@ -4,5 +4,9 @@ CONFIG_X86_MSR=y
 CONFIG_X86_X2APIC=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 
+# Configs around linux guest support and optimizations.
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_KVM_GUEST=y
+
 # Use the maximum number of CPUs supported by KVM (240)
 CONFIG_NR_CPUS=240