diff --git a/CleanSpec.mk b/CleanSpec.mk
index a3eb81c..b72c9d0 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -54,3 +54,6 @@
 
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.health@2.0-service.cuttlefish)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.health@2.0-service.cuttlefish.rc)
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.keymaster@4.0-service)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.keymaster@4.0-service.rc)
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index 35fed01..be86d7f 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -186,7 +186,7 @@
     <hal format="hidl">
         <name>android.hardware.keymaster</name>
         <transport>hwbinder</transport>
-        <version>4.0</version>
+        <version>4.1</version>
         <interface>
             <name>IKeymasterDevice</name>
             <instance>default</instance>
diff --git a/shared/device.mk b/shared/device.mk
index 26ba978..f8cfd67 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -301,8 +301,7 @@
 # Keymaster HAL
 #
 PRODUCT_PACKAGES += \
-     android.hardware.keymaster@4.0-impl \
-     android.hardware.keymaster@4.0-service
+     android.hardware.keymaster@4.1-service
 
 #
 # Power HAL