diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 7a09ddb50b..aeb6fd6851 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -189,7 +189,6 @@ PRODUCT_PACKAGES += \
     libutils \
     libvorbisidec \
     libvulkan \
-    libwifi-service \
     libwilhelm \
     linker \
     linkerconfig \
@@ -273,8 +272,8 @@ PRODUCT_PACKAGES += \
     vndkprivate.libraries.txt \
     WallpaperBackup \
     watchdogd \
+    InProcessWifiStack \
     wificond \
-    wifi-service \
     wm \
 
 # VINTF data for system image
diff --git a/target/product/go_defaults_common.mk b/target/product/go_defaults_common.mk
index aee7f477e2..bfb0317b9a 100644
--- a/target/product/go_defaults_common.mk
+++ b/target/product/go_defaults_common.mk
@@ -39,6 +39,7 @@ PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false
 
 # Do not spin up a separate process for the network stack on go devices, use an in-process APK.
 PRODUCT_PACKAGES += InProcessNetworkStack
+PRODUCT_PACKAGES += InProcessWifiStack
 
 # Strip the local variable table and the local variable type table to reduce
 # the size of the system image. This has no bearing on stack traces, but will
diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index eeeecd9033..898d1728e7 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -53,7 +53,6 @@ endif
 PRODUCT_SYSTEM_SERVER_JARS := \
     services \
     ethernet-service \
-    wifi-service \
     com.android.location.provider \
     jobscheduler-service \