diff --git a/secure_fw/spm/cmsis_psa/spm_ipc.c b/secure_fw/spm/cmsis_psa/spm_ipc.c
index a06baec..249973f 100755
--- a/secure_fw/spm/cmsis_psa/spm_ipc.c
+++ b/secure_fw/spm/cmsis_psa/spm_ipc.c
@@ -42,6 +42,9 @@
 #include "load/asset_defs.h"
 #include "load/spm_load_api.h"
 #include "tfm_nspm.h"
+#if defined(CONFIG_TFM_PARTITION_META)
+#include "tfm_hal_memory_symbols.h"
+#endif
 
 #if !(defined CONFIG_TFM_CONN_HANDLE_MAX_NUM) || (CONFIG_TFM_CONN_HANDLE_MAX_NUM == 0)
 #error "CONFIG_TFM_CONN_HANDLE_MAX_NUM must be defined and not zero."
@@ -51,6 +54,11 @@
 static struct service_head_t services_listhead;
 struct service_t *stateless_services_ref_tbl[STATIC_HANDLE_NUM_LIMIT];
 
+#if defined(CONFIG_TFM_PARTITION_META)
+/* Indicator point to the partition meta */
+static uintptr_t *partition_meta_indicator_pos = NULL;
+#endif
+
 /* Pools */
 TFM_POOL_DECLARE(conn_handle_pool, sizeof(struct conn_handle_t),
                  CONFIG_TFM_CONN_HANDLE_MAX_NUM);
@@ -569,6 +577,10 @@
         backend_instance.comp_init_assuredly(partition, service_setting);
     }
 
+#if defined(CONFIG_TFM_PARTITION_META)
+    partition_meta_indicator_pos = (uintptr_t *)hal_mem_sp_meta_start;
+#endif
+
     return backend_instance.system_run();
 }
 
@@ -615,6 +627,13 @@
         CRITICAL_SECTION_LEAVE(cs);
     }
 
+#if defined(CONFIG_TFM_PARTITION_META)
+    /* Update meta indicator */
+    if (partition_meta_indicator_pos && (p_part_next->p_metadata)) {
+        *partition_meta_indicator_pos = (uintptr_t)(p_part_next->p_metadata);
+    }
+#endif
+
     return AAPCS_DUAL_U32_AS_U64(ctx_ctrls);
 }
 
diff --git a/secure_fw/spm/ffm/backend_ipc.c b/secure_fw/spm/ffm/backend_ipc.c
index f43cfbc..22a7794 100644
--- a/secure_fw/spm/ffm/backend_ipc.c
+++ b/secure_fw/spm/ffm/backend_ipc.c
@@ -9,6 +9,7 @@
 #include <stdint.h>
 #include "critical_section.h"
 #include "compiler_ext_defs.h"
+#include "runtime_defs.h"
 #include "spm_ipc.h"
 #include "tfm_hal_isolation.h"
 #include "tfm_hal_platform.h"
@@ -41,6 +42,20 @@
 
 #endif
 
+static void prv_process_metadata(struct partition_t *p_pt)
+{
+    struct runtime_metadata_t *p_rtmd = NULL;
+
+    if (p_pt->p_ldinf->entry) {
+        ARCH_CTXCTRL_ALLOCATE_STACK(&p_pt->ctx_ctrl, sizeof(*p_rtmd));
+        p_rtmd = (struct runtime_metadata_t *)ARCH_CTXCTRL_ALLOCATED_PTR(
+                                                            &p_pt->ctx_ctrl);
+        p_rtmd->entry = p_pt->p_ldinf->entry;
+    }
+
+    p_pt->p_metadata = p_rtmd;
+}
+
 /*
  * Send message and wake up the SP who is waiting on message queue, block the
  * current thread and trigger scheduler.
@@ -101,6 +116,8 @@
     return PSA_SUCCESS;
 }
 
+extern void sprt_main(void);
+
 /* Parameters are treated as assuredly */
 static void ipc_comp_init_assuredly(struct partition_t *p_pt,
                                     uint32_t service_setting)
@@ -120,6 +137,8 @@
                       LOAD_ALLOCED_STACK_ADDR(p_pldi),
                       p_pldi->stack_size);
 
+    prv_process_metadata(p_pt);
+
     THRD_INIT(&p_pt->thrd, &p_pt->ctx_ctrl,
               TO_THREAD_PRIORITY(PARTITION_PRIORITY(p_pldi->flags)));
 
@@ -130,7 +149,7 @@
 #endif
 
     thrd_start(&p_pt->thrd,
-               POSITION_TO_ENTRY(p_pldi->entry, thrd_fn_t),
+               POSITION_TO_ENTRY(sprt_main, thrd_fn_t),
                THRD_GENERAL_EXIT);
 }
 
diff --git a/secure_fw/spm/include/interface/runtime_defs.h b/secure_fw/spm/include/interface/runtime_defs.h
new file mode 100644
index 0000000..9c22050
--- /dev/null
+++ b/secure_fw/spm/include/interface/runtime_defs.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2022, Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+#ifndef __RUNTIME_DEFS_H__
+#define __RUNTIME_DEFS_H__
+
+#include <stdint.h>
+
+struct runtime_metadata_t {
+    uintptr_t entry;
+};
+
+#endif /* __RUNTIME_DEFS_H__ */