diff --git a/device.mk b/device.mk
index 2b1d3ff..4f59384 100644
--- a/device.mk
+++ b/device.mk
@@ -175,8 +175,7 @@ PRODUCT_COPY_FILES += \
 
 # Keymaster
 PRODUCT_PACKAGES += \
-    android.hardware.keymaster@3.0-impl \
-    android.hardware.keymaster@3.0-service
+    android.hardware.keymaster@4.1-service
 
 # Lights
 PRODUCT_PACKAGES += \
diff --git a/manifest.xml b/manifest.xml
index 4f696bd..e0cbbb7 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -58,15 +58,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.keymaster</name>
-        <transport>hwbinder</transport>
-        <version>3.0</version>
-        <interface>
-            <name>IKeymasterDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.media.c2</name>
         <transport>hwbinder</transport>