diff --git a/plat/juno/aarch64/plat_common.c b/plat/juno/aarch64/plat_common.c
index cd64598aef08b386b9a3bb8dd0997fb8634aa2b9..280122de6869487f9602b46bfe781dfaeca452e5 100644
--- a/plat/juno/aarch64/plat_common.c
+++ b/plat/juno/aarch64/plat_common.c
@@ -33,10 +33,6 @@
 #include <xlat_tables.h>
 #include <assert.h>
 
-unsigned char platform_normal_stacks[PLATFORM_STACK_SIZE][PLATFORM_CORE_COUNT]
-__attribute__ ((aligned(PLATFORM_CACHE_LINE_SIZE),
-		section("tzfw_normal_stacks")));
-
 
 void enable_mmu()
 {
diff --git a/plat/juno/platform.h b/plat/juno/platform.h
index fcf63b7ce7d157160b240d417bcae7ea23dee0b4..aa463665831c2db8a4d44e2f25e3af466c4006ef 100644
--- a/plat/juno/platform.h
+++ b/plat/juno/platform.h
@@ -47,7 +47,16 @@
 /*******************************************************************************
  * Generic platform constants
  ******************************************************************************/
-#define PLATFORM_STACK_SIZE		0x800
+
+/* Size of cacheable stacks */
+#define PLATFORM_STACK_SIZE    0x800
+
+/* Size of coherent stacks for debug and release builds */
+#if DEBUG
+#define PCPU_DV_MEM_STACK_SIZE 0x400
+#else
+#define PCPU_DV_MEM_STACK_SIZE 0x300
+#endif
 
 #define FIRMWARE_WELCOME_STR		"Booting trusted firmware boot loader stage 1\n\r"
 
diff --git a/plat/juno/platform.mk b/plat/juno/platform.mk
index d74b6eb80967b4a4c039dde571da10b9da372f5c..3e705b8c674b00dfff29691f89c6ed8ed7711b31 100644
--- a/plat/juno/platform.mk
+++ b/plat/juno/platform.mk
@@ -63,11 +63,13 @@ PLAT_BL_COMMON_SOURCES	:=	mmio.c					\
 BL1_SOURCES		+=	bl1_plat_setup.c			\
 				bl1_plat_helpers.S			\
 				plat_helpers.S				\
+				platform_up_stack.S			\
 				plat_common.c				\
 				cci400.c
 
 BL2_SOURCES		+=	bakery_lock.c				\
 				bl2_plat_setup.c			\
+				platform_up_stack.S			\
 				mhu.c					\
 				plat_helpers.S				\
 				plat_common.c				\
@@ -77,6 +79,7 @@ BL2_SOURCES		+=	bakery_lock.c				\
 BL31_SOURCES		+=	bl31_plat_setup.c			\
 				mhu.c					\
 				plat_helpers.S				\
+				platform_mp_stack.S			\
 				plat_common.c				\
 				plat_pm.c				\
 				plat_topology.c				\