diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 6fbaf4ebf6..1af367ae2d 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -267,7 +267,7 @@ PRODUCT_PACKAGES += \
     vold \
     WallpaperBackup \
     watchdogd \
-    InProcessWifiStack \
+    wifi-service \
     wificond \
     wm \
 
diff --git a/target/product/go_defaults_common.mk b/target/product/go_defaults_common.mk
index 5d4f5a575c..ada339ac50 100644
--- a/target/product/go_defaults_common.mk
+++ b/target/product/go_defaults_common.mk
@@ -39,7 +39,6 @@ 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
 PRODUCT_PACKAGES += CellBroadcastAppPlatform
 PRODUCT_PACKAGES += CellBroadcastServiceModulePlatform
 
diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 86b2133d85..475393ffc4 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -52,6 +52,7 @@ endif
 # The order here is the same order they end up on the classpath, so it matters.
 PRODUCT_SYSTEM_SERVER_JARS := \
     services \
+    wifi-service \
     ethernet-service \
     com.android.location.provider \
     service-jobscheduler \