diff --git a/build.config.cuttlefish b/build.config.cuttlefish
index 322869c..2c7abd4 100644
--- a/build.config.cuttlefish
+++ b/build.config.cuttlefish
@@ -6,4 +6,6 @@
 BUILD_INITRAMFS=1
 EXT_MODULES="common-modules/virtual-device"
 LZ4_RAMDISK=1
-MODULES_OPTIONS="common-modules/virtual-device/modules.options"
+
+# TODO(b/176860479): Remove once goldfish and cuttlefish share a wifi implementation
+MODULES_OPTIONS="options mac80211_hwsim radios=0"
diff --git a/modules.options b/modules.options
deleted file mode 100644
index ce0df43..0000000
--- a/modules.options
+++ /dev/null
@@ -1,2 +0,0 @@
-# TODO(b/176860479): Remove once goldfish and cuttlefish share a wifi implementation
-options mac80211_hwsim radios=0