diff --git a/arch/arm64/configs/microdroid.fragment b/arch/arm64/configs/microdroid.fragment
index a9752c9b6371..6ec7942f559b 100644
--- a/arch/arm64/configs/microdroid.fragment
+++ b/arch/arm64/configs/microdroid.fragment
@@ -20,3 +20,6 @@ CONFIG_VIRTIO_VSOCKETS=y
 # CONFIG_SERIAL_SPRD_CONSOLE is not set
 # CONFIG_HVC_DCC=y is not set
 # CONFIG_SERIAL_DEV_BUS is not set
+
+# Remove config options that are for unknown vendor modules
+# CONFIG_GKI_HACKS_TO_FIX is not set
diff --git a/arch/x86/configs/microdroid.fragment b/arch/x86/configs/microdroid.fragment
index 25e6b1a55aec..dface773ca7f 100644
--- a/arch/x86/configs/microdroid.fragment
+++ b/arch/x86/configs/microdroid.fragment
@@ -12,3 +12,6 @@ CONFIG_VIRTIO_VSOCKETS=y
 # CONFIG_SERIAL_SAMSUNG is not set
 # CONFIG_SERIAL_SAMSUNG_CONSOLE is not set
 # CONFIG_SERIAL_DEV_BUS is not set
+
+# Remove config options that are for unknown vendor modules
+# CONFIG_GKI_HACKS_TO_FIX is not set