diff --git a/Android.bp b/Android.bp
index befbca1..f83c5c8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -228,6 +228,15 @@ prebuilt_etc_xml {
 	soc_specific: true,
 }
 
+prebuilt_etc_xml {
+	name: "android.hardware.keymaster@4.1-service-default-qti",
+	owner: "xiaomi",
+	src: "proprietary/vendor/etc/vintf/manifest/android.hardware.keymaster@4.1-service-default-qti.xml",
+	filename_from_src: true,
+	sub_dir: "vintf/manifest",
+	soc_specific: true,
+}
+
 prebuilt_etc_xml {
 	name: "android.hardware.neuralnetworks@1.3-service-qti-hta",
 	owner: "xiaomi",
diff --git a/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service-qti b/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service-qti
index 1d750d2..ad436f8 100644
Binary files a/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service-qti and b/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service-qti differ
diff --git a/proprietary/vendor/bin/hw/android.hardware.keymaster@4.1-service-qti b/proprietary/vendor/bin/hw/android.hardware.keymaster@4.1-service-qti
new file mode 100644
index 0000000..548baa2
Binary files /dev/null and b/proprietary/vendor/bin/hw/android.hardware.keymaster@4.1-service-qti differ
diff --git a/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc b/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc
deleted file mode 100644
index 94783de..0000000
--- a/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-on init
-    start keymaster-4-0
-
-service keymaster-4-0 /vendor/bin/hw/android.hardware.keymaster@4.0-service-qti
-    class early_hal
-    user system
-    group system drmrpc
diff --git a/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc b/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc
new file mode 100644
index 0000000..5cd13dc
--- /dev/null
+++ b/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc
@@ -0,0 +1,7 @@
+on init
+    start vendor.keymaster-4-1
+
+service vendor.keymaster-4-1 /vendor/bin/hw/android.hardware.keymaster@4.1-service-qti
+    class early_hal
+    user system
+    group system drmrpc
diff --git a/proprietary/vendor/etc/vintf/manifest/android.hardware.keymaster@4.1-service-default-qti.xml b/proprietary/vendor/etc/vintf/manifest/android.hardware.keymaster@4.1-service-default-qti.xml
new file mode 100644
index 0000000..bf26d63
--- /dev/null
+++ b/proprietary/vendor/etc/vintf/manifest/android.hardware.keymaster@4.1-service-default-qti.xml
@@ -0,0 +1,39 @@
+<!-- Copyright (c) 2020 Qualcomm Technologies, Inc.
+All Rights Reserved.
+Confidential and Proprietary - Qualcomm Technologies, Inc.
+
+Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+       <name>android.hardware.keymaster</name>
+       <transport>hwbinder</transport>
+       <fqname>@4.1::IKeymasterDevice/default</fqname>
+    </hal>
+</manifest>
diff --git a/proprietary/vendor/lib/libkeymasterdeviceutils.so b/proprietary/vendor/lib/libkeymasterdeviceutils.so
index 5006651..018a806 100644
Binary files a/proprietary/vendor/lib/libkeymasterdeviceutils.so and b/proprietary/vendor/lib/libkeymasterdeviceutils.so differ
diff --git a/proprietary/vendor/lib/libkeymasterutils.so b/proprietary/vendor/lib/libkeymasterutils.so
index 12401e8..c75a918 100644
Binary files a/proprietary/vendor/lib/libkeymasterutils.so and b/proprietary/vendor/lib/libkeymasterutils.so differ
diff --git a/proprietary/vendor/lib/libqcbor.so b/proprietary/vendor/lib/libqcbor.so
index 53c529d..90c7d84 100644
Binary files a/proprietary/vendor/lib/libqcbor.so and b/proprietary/vendor/lib/libqcbor.so differ
diff --git a/proprietary/vendor/lib/libqtikeymaster4.so b/proprietary/vendor/lib/libqtikeymaster4.so
index dbc1ac9..ff93a31 100644
Binary files a/proprietary/vendor/lib/libqtikeymaster4.so and b/proprietary/vendor/lib/libqtikeymaster4.so differ
diff --git a/proprietary/vendor/lib64/libkeymasterdeviceutils.so b/proprietary/vendor/lib64/libkeymasterdeviceutils.so
index 0a7a088..3c38299 100644
Binary files a/proprietary/vendor/lib64/libkeymasterdeviceutils.so and b/proprietary/vendor/lib64/libkeymasterdeviceutils.so differ
diff --git a/proprietary/vendor/lib64/libkeymasterutils.so b/proprietary/vendor/lib64/libkeymasterutils.so
index 1550a36..49b59fd 100644
Binary files a/proprietary/vendor/lib64/libkeymasterutils.so and b/proprietary/vendor/lib64/libkeymasterutils.so differ
diff --git a/proprietary/vendor/lib64/libqcbor.so b/proprietary/vendor/lib64/libqcbor.so
index 063f61b..4f236d8 100644
Binary files a/proprietary/vendor/lib64/libqcbor.so and b/proprietary/vendor/lib64/libqcbor.so differ
diff --git a/proprietary/vendor/lib64/libqtikeymaster4.so b/proprietary/vendor/lib64/libqtikeymaster4.so
index f8345f9..c95f8e6 100644
Binary files a/proprietary/vendor/lib64/libqtikeymaster4.so and b/proprietary/vendor/lib64/libqtikeymaster4.so differ
diff --git a/sm6250-common-vendor.mk b/sm6250-common-vendor.mk
index 0048307..5e42545 100644
--- a/sm6250-common-vendor.mk
+++ b/sm6250-common-vendor.mk
@@ -73,6 +73,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sm6250-common/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gatekeeper@1.0-service-qti \
     vendor/xiaomi/sm6250-common/proprietary/vendor/bin/hw/android.hardware.gnss@2.1-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gnss@2.1-service-qti \
     vendor/xiaomi/sm6250-common/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.keymaster@4.0-service-qti \
+    vendor/xiaomi/sm6250-common/proprietary/vendor/bin/hw/android.hardware.keymaster@4.1-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.keymaster@4.1-service-qti \
     vendor/xiaomi/sm6250-common/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.neuralnetworks@1.3-service-qti \
     vendor/xiaomi/sm6250-common/proprietary/vendor/bin/hw/qcrild:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qcrild \
     vendor/xiaomi/sm6250-common/proprietary/vendor/bin/hw/vendor.display.color@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.display.color@1.0-service \
@@ -204,7 +205,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sm6250-common/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.3-service.widevine.rc \
     vendor/xiaomi/sm6250-common/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc \
     vendor/xiaomi/sm6250-common/proprietary/vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss@2.1-service-qti.rc \
-    vendor/xiaomi/sm6250-common/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.0-service-qti.rc \
+    vendor/xiaomi/sm6250-common/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.1-service-qti.rc \
     vendor/xiaomi/sm6250-common/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc \
     vendor/xiaomi/sm6250-common/proprietary/vendor/etc/init/cnd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cnd.rc \
     vendor/xiaomi/sm6250-common/proprietary/vendor/etc/init/dataadpl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataadpl.rc \
@@ -1136,6 +1137,7 @@ PRODUCT_PACKAGES += \
     dpmapi \
     qcrilhook \
     android.hardware.gnss@2.1-service-qti \
+    android.hardware.keymaster@4.1-service-default-qti \
     android.hardware.neuralnetworks@1.3-service-qti-hta \
     android.hardware.neuralnetworks@1.3-service-qti \
     manifest_android.hardware.drm@1.3-service.widevine \