diff --git a/Android.bp b/Android.bp
index 6c69c77..4084c6b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1474,6 +1474,39 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libteecl",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libteecl.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libdl",
+                "libc",
+            ],
+        },
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libteecl.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libdl",
+                "libc",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libtinyalsa.s5e8825",
     stem: "libtinyalsa.s5e8825",
@@ -1510,6 +1543,40 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libuuid_vendor",
+    stem: "libuuid",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libuuid.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libdl",
+                "libc",
+            ],
+        },
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libuuid.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libdl",
+                "libc",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "sensors.grip",
     owner: "samsung",
@@ -3003,6 +3070,56 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
+cc_prebuilt_binary {
+    name: "tzdaemon",
+    owner: "samsung",
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/bin/tzdaemon",
+            ],
+            shared_libs: [
+                "libteecl",
+                "libuuid",
+                "liblog",
+                "libdl",
+                "libc",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    strip: {
+        none: true,
+    },
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_binary {
+    name: "tzts_daemon",
+    owner: "samsung",
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/bin/tzts_daemon",
+            ],
+            shared_libs: [
+                "libteecl",
+                "libuuid",
+                "liblog",
+                "libdl",
+                "libc",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    strip: {
+        none: true,
+    },
+    prefer: true,
+    soc_specific: true,
+}
+
 install_symlink {
     name: "vendor_lib_libOpenCL_so",
     soc_specific: true,
diff --git a/proprietary/vendor/bin/tzdaemon b/proprietary/vendor/bin/tzdaemon
new file mode 100755
index 0000000..2944aca
Binary files /dev/null and b/proprietary/vendor/bin/tzdaemon differ
diff --git a/proprietary/vendor/bin/tzts_daemon b/proprietary/vendor/bin/tzts_daemon
new file mode 100755
index 0000000..b8b2dc7
Binary files /dev/null and b/proprietary/vendor/bin/tzts_daemon differ
diff --git a/proprietary/vendor/etc/init/teegris_v4.rc b/proprietary/vendor/etc/init/teegris_v4.rc
new file mode 100644
index 0000000..6da5846
--- /dev/null
+++ b/proprietary/vendor/etc/init/teegris_v4.rc
@@ -0,0 +1,27 @@
+on post-fs
+# TEEGRIS service
+    mkdir /mnt/vendor/efs/tee 0700 system system
+    mkdir /dev/socket/iwt 0770 system system
+    mkdir /dev/socket/iwt/ca 0770 system system
+    start tz_service
+    wait_for_prop vendor.tzdaemon Ready
+    setprop vendor.TEEGRIS.loaded true
+    write /proc/iccc_ready 1
+    start tzts_service
+    wait_for_prop vendor.tzts_daemon Ready
+
+on post-fs-data
+# TEEGRIS service
+    mkdir /data/vendor/tee 0700 system system
+
+service tz_service /vendor/bin/tzdaemon
+    class core
+    user system
+    group system readproc
+    disabled
+
+service tzts_service /vendor/bin/tzts_daemon
+    class core
+    user system
+    group system
+    disabled
diff --git a/proprietary/vendor/lib/libteecl.so b/proprietary/vendor/lib/libteecl.so
new file mode 100644
index 0000000..670eeb7
Binary files /dev/null and b/proprietary/vendor/lib/libteecl.so differ
diff --git a/proprietary/vendor/lib/libuuid.so b/proprietary/vendor/lib/libuuid.so
new file mode 100644
index 0000000..b9be086
Binary files /dev/null and b/proprietary/vendor/lib/libuuid.so differ
diff --git a/proprietary/vendor/lib64/libteecl.so b/proprietary/vendor/lib64/libteecl.so
new file mode 100644
index 0000000..f19ced3
Binary files /dev/null and b/proprietary/vendor/lib64/libteecl.so differ
diff --git a/proprietary/vendor/lib64/libuuid.so b/proprietary/vendor/lib64/libuuid.so
new file mode 100644
index 0000000..d8adeb9
Binary files /dev/null and b/proprietary/vendor/lib64/libuuid.so differ
diff --git a/s5e8825-common-vendor.mk b/s5e8825-common-vendor.mk
index 1ec273e..81f97ed 100644
--- a/s5e8825-common-vendor.mk
+++ b/s5e8825-common-vendor.mk
@@ -21,6 +21,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/init.sensorhub.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.sensorhub.rc \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/init.vendor.rilcommon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.vendor.rilcommon.rc \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/secaudiohalaidl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/secaudiohalaidl.rc \
+    vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/teegris_v4.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/teegris_v4.rc \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/vaultkeeper_common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vaultkeeper_common.rc \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/vendor.samsung.hardware.gnss@2.1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.samsung.hardware.gnss@2.1-service.rc \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/vendor.samsung.rilchip.slsi.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.samsung.rilchip.slsi.rc \
@@ -76,7 +77,9 @@ PRODUCT_PACKAGES += \
     libspatializerparamstorage \
     libspeakercalibration \
     libswcnr \
+    libteecl \
     libtinyalsa.s5e8825 \
+    libuuid_vendor \
     sensors.grip \
     sensors.inputvirtual \
     sensors.sensorhub \
@@ -128,7 +131,9 @@ PRODUCT_PACKAGES += \
     rild \
     secaudiohalaidl \
     vendor.samsung.hardware.gnss@2.1-service \
-    secril_config_svc
+    secril_config_svc \
+    tzdaemon \
+    tzts_daemon
 
 PRODUCT_PACKAGES += \
     vendor_lib_libOpenCL_so \