diff --git a/device.mk b/device.mk
index ef18a87..9b3ba0a 100644
--- a/device.mk
+++ b/device.mk
@@ -452,9 +452,11 @@ PRODUCT_COPY_FILES += \
 
 # Wi-Fi
 PRODUCT_PACKAGES += \
+    android.hardware.wifi-service \
     wpa_supplicant \
     hostapd \
-    android.hardware.wifi@1.0-service-lazy
+    libkeystore-wifi-hidl:64 \
+    libkeystore-engine-wifi-hidl:64
 
 PRODUCT_PACKAGES += \
     android.hardware.tetheroffload.config@1.0.vendor \