diff --git a/core/arch/arm/plat-vexpress/conf.mk b/core/arch/arm/plat-vexpress/conf.mk
index 3bf5c83..5f0814c 100644
--- a/core/arch/arm/plat-vexpress/conf.mk
+++ b/core/arch/arm/plat-vexpress/conf.mk
@@ -136,6 +136,11 @@
 CFG_MULTI_CORE_HALTING ?= y
 CFG_TEE_CORE_NB_CORE ?= 4
 CFG_AUTO_MAX_PA_BITS ?= y
+ifeq ($(CFG_ARM_GICV3),y)
+CFG_CORE_CLUSTER_SHIFT ?= 4
+else
+CFG_CORE_CLUSTER_SHIFT ?= 3
+endif
 ifneq ($(CFG_CORE_SEL2_SPMC),y)
 # [0e00.0000 0e0f.ffff] is reserved to early boot
 CFG_TZDRAM_START ?= 0x0e100000