diff --git a/manifest.xml b/manifest.xml
index 36f8536e..dba53ebd 100755
--- a/manifest.xml
+++ b/manifest.xml
@@ -66,11 +66,6 @@
         <fqname>@3.0::IMapper/default</fqname>
         <fqname>@4.0::IMapper/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.keymaster</name>
-        <transport>hwbinder</transport>
-        <fqname>@3.0::IKeymasterDevice/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.media.omx</name>
         <transport>hwbinder</transport>
diff --git a/sdm660.mk b/sdm660.mk
index 40e4e35b..dccd4aea 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -288,8 +288,7 @@ PRODUCT_PACKAGES += \
     android.hardware.media.c2@1.1.vendor \
     android.hardware.neuralnetworks@1.3 \
     android.hardware.neuralnetworks@1.3.vendor \
-    android.hardware.keymaster@4.0-impl \
-    android.hardware.keymaster@4.0-service \
+    android.hardware.keymaster@3.0.vendor \
     android.hardware.keymaster@4.0.vendor \
     android.hardware.radio.config@1.2.vendor \
     android.hardware.radio@1.4.vendor \