diff --git a/Android.bp b/Android.bp
index ba6ba61..3896c69 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1514,6 +1514,31 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libstork_shared",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libstork_shared.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libswcnr",
     owner: "samsung",
@@ -1715,6 +1740,34 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libvkservice",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libvkservice.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "liblog",
+                "libstork_shared",
+                "libteecl",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libwrappergps",
     owner: "samsung",
@@ -2234,6 +2287,31 @@ 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",
@@ -2300,6 +2378,15 @@ 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",
@@ -2612,6 +2699,34 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
+cc_prebuilt_binary {
+    name: "vaultkeeperd",
+    owner: "samsung",
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/bin/vaultkeeperd",
+            ],
+            shared_libs: [
+                "libdsms_vendor",
+                "libvkservice",
+                "libcutils",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    strip: {
+        none: true,
+    },
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_binary {
     name: "vendor.samsung.hardware.security.proca@2.0-service",
     owner: "samsung",
@@ -2639,6 +2754,40 @@ 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/vaultkeeperd b/proprietary/vendor/bin/vaultkeeperd
new file mode 100755
index 0000000..db2efcb
Binary files /dev/null and b/proprietary/vendor/bin/vaultkeeperd differ
diff --git a/proprietary/vendor/bin/vendor.samsung.hardware.security.vaultkeeper-service b/proprietary/vendor/bin/vendor.samsung.hardware.security.vaultkeeper-service
new file mode 100755
index 0000000..742f366
Binary files /dev/null and b/proprietary/vendor/bin/vendor.samsung.hardware.security.vaultkeeper-service 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
new file mode 100644
index 0000000..153e06e
--- /dev/null
+++ b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.security.vaultkeeper-manifest.xml
@@ -0,0 +1,7 @@
+<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/libstork_shared.so b/proprietary/vendor/lib64/libstork_shared.so
new file mode 100644
index 0000000..5c72215
Binary files /dev/null and b/proprietary/vendor/lib64/libstork_shared.so differ
diff --git a/proprietary/vendor/lib64/libvkservice.so b/proprietary/vendor/lib64/libvkservice.so
new file mode 100644
index 0000000..08a827e
Binary files /dev/null and b/proprietary/vendor/lib64/libvkservice.so differ
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
new file mode 100644
index 0000000..b5ad712
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.samsung.hardware.security.vaultkeeper-V1-ndk_platform.so differ
diff --git a/s5e8825-common-vendor.mk b/s5e8825-common-vendor.mk
index 527192a..5ffc065 100644
--- a/s5e8825-common-vendor.mk
+++ b/s5e8825-common-vendor.mk
@@ -111,6 +111,7 @@ PRODUCT_PACKAGES += \
     libspatializerparamstorage \
     libspeakercalibration \
     libssl-tm \
+    libstork_shared \
     libswcnr \
     libsynaFpSensorTestNwd \
     libteecl \
@@ -119,6 +120,7 @@ PRODUCT_PACKAGES += \
     libuniplugin \
     libuuid_vendor \
     libvkmanager_vendor \
+    libvkservice \
     libwrappergps \
     libwvaidl \
     sensors.grip \
@@ -137,11 +139,13 @@ 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 \
@@ -154,7 +158,9 @@ PRODUCT_PACKAGES += \
     secril_config_svc \
     tzdaemon \
     tzts_daemon \
-    vendor.samsung.hardware.security.proca@2.0-service
+    vaultkeeperd \
+    vendor.samsung.hardware.security.proca@2.0-service \
+    vendor.samsung.hardware.security.vaultkeeper-service
 
 PRODUCT_PACKAGES += \
     vendor_lib64_libOpenCL_so \