diff --git a/Android.bp b/Android.bp
index 3896c69..3323b17 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2287,31 +2287,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.samsung.hardware.security.vaultkeeper-V1-ndk_platform",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.samsung.hardware.security.vaultkeeper-V1-ndk_platform.so",
-            ],
-            shared_libs: [
-                "libbinder_ndk",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.samsung.hardware.thermal@1.0",
     owner: "samsung",
@@ -2378,15 +2353,6 @@ prebuilt_etc_xml {
     soc_specific: true,
 }
 
-prebuilt_etc_xml {
-    name: "vendor.samsung.hardware.security.vaultkeeper-manifest.xml",
-    owner: "samsung",
-    src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.security.vaultkeeper-manifest.xml",
-    filename_from_src: true,
-    sub_dir: "vintf/manifest",
-    soc_specific: true,
-}
-
 prebuilt_etc_xml {
     name: "vendor.samsung.hardware.sehradio_manifest_2_33.xml",
     owner: "samsung",
@@ -2754,40 +2720,6 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
-cc_prebuilt_binary {
-    name: "vendor.samsung.hardware.security.vaultkeeper-service",
-    owner: "samsung",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/bin/vendor.samsung.hardware.security.vaultkeeper-service",
-            ],
-            shared_libs: [
-                "vendor.samsung.hardware.security.vaultkeeper-V1-ndk_platform",
-                "libbinder_ndk",
-                "liblog",
-                "libbase",
-                "libutils",
-                "libcutils",
-                "libhardware",
-                "libhidlbase",
-                "libbinder",
-                "libvkmanager_vendor",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    soc_specific: true,
-}
-
 install_symlink {
     name: "vendor_lib64_libOpenCL_so",
     soc_specific: true,
diff --git a/proprietary/vendor/bin/vendor.samsung.hardware.security.vaultkeeper-service b/proprietary/vendor/bin/vendor.samsung.hardware.security.vaultkeeper-service
deleted file mode 100755
index 742f366..0000000
Binary files a/proprietary/vendor/bin/vendor.samsung.hardware.security.vaultkeeper-service and /dev/null differ
diff --git a/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.security.vaultkeeper-manifest.xml b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.security.vaultkeeper-manifest.xml
deleted file mode 100644
index 153e06e..0000000
--- a/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.security.vaultkeeper-manifest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="aidl">
-        <name>vendor.samsung.hardware.security.vaultkeeper</name>
-        <version>1</version>
-        <fqname>ISehVaultKeeper/default</fqname>
-    </hal>
-</manifest>
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.security.vaultkeeper-V1-ndk_platform.so b/proprietary/vendor/lib64/vendor.samsung.hardware.security.vaultkeeper-V1-ndk_platform.so
deleted file mode 100644
index b5ad712..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.security.vaultkeeper-V1-ndk_platform.so and /dev/null differ
diff --git a/s5e8825-common-vendor.mk b/s5e8825-common-vendor.mk
index 5ffc065..2cfac17 100644
--- a/s5e8825-common-vendor.mk
+++ b/s5e8825-common-vendor.mk
@@ -139,13 +139,11 @@ PRODUCT_PACKAGES += \
     vendor.samsung.hardware.radio.data-V1-ndk \
     vendor.samsung.hardware.radio.messaging-V1-ndk \
     vendor.samsung.hardware.radio.sim-V1-ndk \
-    vendor.samsung.hardware.security.vaultkeeper-V1-ndk_platform \
     vendor.samsung.hardware.thermal@1.0 \
     manifest_android.hardware.drm-service.widevine.xml \
     secaudiohalaidl_manifest.xml \
     vendor.samsung.hardware.radio.exclude.slsi.xml \
     vendor.samsung.hardware.radio_manifest_2_33.xml \
-    vendor.samsung.hardware.security.vaultkeeper-manifest.xml \
     vendor.samsung.hardware.sehradio_manifest_2_33.xml \
     cass \
     epic \
@@ -159,8 +157,7 @@ PRODUCT_PACKAGES += \
     tzdaemon \
     tzts_daemon \
     vaultkeeperd \
-    vendor.samsung.hardware.security.proca@2.0-service \
-    vendor.samsung.hardware.security.vaultkeeper-service
+    vendor.samsung.hardware.security.proca@2.0-service
 
 PRODUCT_PACKAGES += \
     vendor_lib64_libOpenCL_so \