diff --git a/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os-tadevkit_3.18.0.bbappend b/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os-tadevkit_3.18.0.bbappend
new file mode 100644
index 0000000..778510b
--- /dev/null
+++ b/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os-tadevkit_3.18.0.bbappend
@@ -0,0 +1,9 @@
+SRC_URI:remove:npcm8xx = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
+
+SRC_URI:remove:npcm8xx = " \
+    file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \
+   "
+
+SRC_URI:append:npcm8xx = "git://github.com/Nuvoton-Israel/optee_os.git;branch=npcm_3_18;protocol=https"
+
+SRCREV:npcm8xx = "485dc7ac4e4a3f51d86c5b6562e3720a338441c7"
diff --git a/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os_3.18.0.bbappend b/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os_3.18.0.bbappend
new file mode 100644
index 0000000..1cdee9e
--- /dev/null
+++ b/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os_3.18.0.bbappend
@@ -0,0 +1,14 @@
+SRC_URI:remove:npcm8xx = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
+
+SRC_URI:remove:npcm8xx = " \
+    file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \
+   "
+
+SRC_URI:append:npcm8xx = "git://github.com/Nuvoton-Israel/optee_os.git;branch=npcm_3_18;protocol=https"
+
+SRCREV:npcm8xx = "485dc7ac4e4a3f51d86c5b6562e3720a338441c7"
+
+do_deploy:npcm8xx() {
+    install -d ${DEPLOYDIR}/
+    install -m 644 ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/
+}