diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
index a0474c0..7bb773d 100644
--- a/compatibility_matrix.xml
+++ b/compatibility_matrix.xml
@@ -39,12 +39,4 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="false">
-        <name>android.system.wifi.keystore</name>
-        <version>1.0</version>
-        <interface>
-            <name>IKeystore</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
 </compatibility-matrix>
diff --git a/device.mk b/device.mk
index 8eb69ac..76c5f27 100644
--- a/device.mk
+++ b/device.mk
@@ -264,7 +264,7 @@ $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk
 
 # Wifi
 PRODUCT_PACKAGES += \
-    android.hardware.wifi@1.0-service \
+    android.hardware.wifi-service \
     hostapd \
     hostapd_cli \
     libwpa_client \