diff --git a/Android.bp b/Android.bp
index 842b2b1..d96a668 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,6 +3,9 @@
 // This file is generated by device/samsung/beyondx/setup-makefiles.sh
 
 soong_namespace {
+	imports: [
+		"vendor/samsung/exynos9820-common",
+	],
 }
 
 cc_prebuilt_library_shared {
@@ -253,6 +256,57 @@ 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"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libvkmanager_vendor",
+	owner: "samsung",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libvkmanager_vendor.so"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "libvkservice",
+	owner: "samsung",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/libvkservice.so"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
 	name: "libwrappergps",
 	owner: "samsung",
@@ -273,7 +327,12 @@ cc_prebuilt_library_shared {
 cc_prebuilt_binary {
 	name: "gpsd",
 	owner: "samsung",
-	srcs: ["proprietary/vendor/bin/hw/gpsd"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/gpsd"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -286,7 +345,12 @@ cc_prebuilt_binary {
 cc_prebuilt_binary {
 	name: "lhd",
 	owner: "samsung",
-	srcs: ["proprietary/vendor/bin/hw/lhd"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/lhd"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -299,7 +363,12 @@ cc_prebuilt_binary {
 cc_prebuilt_binary {
 	name: "vendor.samsung.hardware.gnss@2.0-service",
 	owner: "samsung",
-	srcs: ["proprietary/vendor/bin/hw/vendor.samsung.hardware.gnss@2.0-service"],
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/hw/vendor.samsung.hardware.gnss@2.0-service"],
+		},
+	},
+	compile_multilib: "64",
 	check_elf_files: false,
 	strip: {
 		none: true,
@@ -309,3 +378,20 @@ cc_prebuilt_binary {
 	soc_specific: true,
 }
 
+cc_prebuilt_binary {
+	name: "vaultkeeperd",
+	owner: "samsung",
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/bin/vaultkeeperd"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	strip: {
+		none: true,
+	},
+	prefer: true,
+	soc_specific: true,
+}
+
diff --git a/BoardConfigVendor.mk b/BoardConfigVendor.mk
index d6102f4..a2d281c 100644
--- a/BoardConfigVendor.mk
+++ b/BoardConfigVendor.mk
@@ -2,4 +2,3 @@
 #
 # This file is generated by device/samsung/beyondx/setup-makefiles.sh
 
-AB_OTA_PARTITIONS += \
diff --git a/beyondx-vendor.mk b/beyondx-vendor.mk
index 5f212ea..94b3a62 100644
--- a/beyondx-vendor.mk
+++ b/beyondx-vendor.mk
@@ -11,6 +11,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/beyondx/proprietary/vendor/etc/gnss/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
     vendor/samsung/beyondx/proprietary/vendor/etc/init/init.baseband.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.baseband.rc \
     vendor/samsung/beyondx/proprietary/vendor/etc/init/init.gps.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.gps.rc \
+    vendor/samsung/beyondx/proprietary/vendor/etc/init/vaultkeeper_common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vaultkeeper_common.rc \
     vendor/samsung/beyondx/proprietary/vendor/etc/init/vendor.samsung.hardware.gnss@2.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.samsung.hardware.gnss@2.0-service.rc \
     vendor/samsung/beyondx/proprietary/vendor/etc/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
     vendor/samsung/beyondx/proprietary/vendor/etc/plmn_se13.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_se13.bin \
@@ -68,6 +69,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/beyondx/proprietary/vendor/tee/00000000-0000-0000-0000-46494e474502:$(TARGET_COPY_OUT_VENDOR)/tee/00000000-0000-0000-0000-46494e474502 \
     vendor/samsung/beyondx/proprietary/vendor/tee/00000000-0000-0000-0000-4b45594d5354:$(TARGET_COPY_OUT_VENDOR)/tee/00000000-0000-0000-0000-4b45594d5354 \
     vendor/samsung/beyondx/proprietary/vendor/tee/00000000-0000-0000-0000-505256544545:$(TARGET_COPY_OUT_VENDOR)/tee/00000000-0000-0000-0000-505256544545 \
+    vendor/samsung/beyondx/proprietary/vendor/tee/00000000-0000-0000-0000-564c544b5052:$(TARGET_COPY_OUT_VENDOR)/tee/00000000-0000-0000-0000-564c544b5052 \
     vendor/samsung/beyondx/proprietary/vendor/tee/00000000-0000-0000-0000-657365447276:$(TARGET_COPY_OUT_VENDOR)/tee/00000000-0000-0000-0000-657365447276 \
     vendor/samsung/beyondx/proprietary/vendor/tee/driver/00000000-0000-0000-0000-53626f786476:$(TARGET_COPY_OUT_VENDOR)/tee/driver/00000000-0000-0000-0000-53626f786476
 
@@ -85,7 +87,11 @@ PRODUCT_PACKAGES += \
     gps.default \
     vendor.samsung.hardware.gnss@2.0-impl \
     libexynoscamera3 \
+    libstork_shared \
+    libvkmanager_vendor \
+    libvkservice \
     libwrappergps \
     gpsd \
     lhd \
-    vendor.samsung.hardware.gnss@2.0-service
+    vendor.samsung.hardware.gnss@2.0-service \
+    vaultkeeperd
diff --git a/proprietary/vendor/bin/vaultkeeperd b/proprietary/vendor/bin/vaultkeeperd
new file mode 100755
index 0000000..9a5ff2a
Binary files /dev/null and b/proprietary/vendor/bin/vaultkeeperd differ
diff --git a/proprietary/vendor/etc/init/vaultkeeper_common.rc b/proprietary/vendor/etc/init/vaultkeeper_common.rc
new file mode 100644
index 0000000..0807130
--- /dev/null
+++ b/proprietary/vendor/etc/init/vaultkeeper_common.rc
@@ -0,0 +1,18 @@
+# VaultKeeper
+service vaultkeeper /vendor/bin/vaultkeeperd
+    class core
+    user system
+    group system
+    disabled
+
+service vaultkeeper_hal /vendor/bin/vendor.samsung.hardware.security.vaultkeeper@2.0-service
+    class early_hal
+    user system
+    group system
+    disabled
+
+on late-fs
+    # vaultkeeper
+    mkdir /dev/socket/vaultkeeper 0770 system system
+    start vaultkeeper
+    start vaultkeeper_hal
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/libvkmanager_vendor.so b/proprietary/vendor/lib64/libvkmanager_vendor.so
new file mode 100644
index 0000000..8a4ea93
Binary files /dev/null and b/proprietary/vendor/lib64/libvkmanager_vendor.so differ
diff --git a/proprietary/vendor/lib64/libvkservice.so b/proprietary/vendor/lib64/libvkservice.so
new file mode 100644
index 0000000..9d786df
Binary files /dev/null and b/proprietary/vendor/lib64/libvkservice.so differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-564c544b5052 b/proprietary/vendor/tee/00000000-0000-0000-0000-564c544b5052
new file mode 100644
index 0000000..b14bcbf
Binary files /dev/null and b/proprietary/vendor/tee/00000000-0000-0000-0000-564c544b5052 differ