diff --git a/services/std_svc/spm/el3_spmc/spmc_main.c b/services/std_svc/spm/el3_spmc/spmc_main.c
index 08e7218d1b..95f66b3489 100644
--- a/services/std_svc/spm/el3_spmc/spmc_main.c
+++ b/services/std_svc/spm/el3_spmc/spmc_main.c
@@ -1654,6 +1654,13 @@ static int find_and_prepare_sp_context(void)
 	/* Initialize the SP context with the required ep info. */
 	spmc_sp_common_ep_commit(sp, next_image_ep_info);
 
+	ret = mmap_remove_dynamic_region(manifest_base_align, PAGE_SIZE * 2);
+	if (ret != 0) {
+		ERROR("Error while unmapping manifest_base, ret is (%d).\n",
+				ret);
+		return ret;
+	}
+
 	return 0;
 }
 
diff --git a/services/std_svc/spm/el3_spmc/spmc_setup.c b/services/std_svc/spm/el3_spmc/spmc_setup.c
index 8ebae28526..a6b8631cb7 100644
--- a/services/std_svc/spm/el3_spmc/spmc_setup.c
+++ b/services/std_svc/spm/el3_spmc/spmc_setup.c
@@ -140,6 +140,8 @@ static void spmc_create_boot_info(entry_point_info_t *ep_info,
 	INFO("SP manifest @ 0x%lx, size: %u bytes.\n",
 	     boot_descriptor->content,
 	     boot_descriptor->size_boot_info);
+
+	flush_dcache_range((uintptr_t)ffa_boot_info_mem, PAGE_SIZE);
 }
 
 /*