diff --git a/config/cca-4world.yaml b/config/cca-4world.yaml
index 82851d8d78dcf3e49bbf7821b980ca6238513e2b..185fa683f5447e4a42b2ae37b6b39798d1a1762c 100644
--- a/config/cca-4world.yaml
+++ b/config/cca-4world.yaml
@@ -31,8 +31,6 @@ description: >-
   See cca-3worlds.yaml config :ref:`userguide/configstore/cca-3world:description`
   if willing to launch a realm using kvmtool.
 
-image: shrinkwraptool/base-full
-
 concrete: true
 
 layers:
diff --git a/config/ffa-hafnium-optee.yaml b/config/ffa-hafnium-optee.yaml
index af0ac85863776fb8f9bfaaeab6663ccbd6ba4a0b..33b9db1f4fe5485b58e998acc6831aa71e4decd4 100644
--- a/config/ffa-hafnium-optee.yaml
+++ b/config/ffa-hafnium-optee.yaml
@@ -10,8 +10,6 @@ description: >-
   (Secure Partition Manager Core) and OPTEE as a secure partition/VM
   in secure EL1 and Linux in Normal world.
 
-image: shrinkwraptool/base-full
-
 concrete: true
 
 layers:
diff --git a/config/hafnium-base.yaml b/config/hafnium-base.yaml
index fca2c2e5bac5b5da1ff142f5b5e87ce794a32431..612b44f180b2e3ae06f55faf893740762301688f 100644
--- a/config/hafnium-base.yaml
+++ b/config/hafnium-base.yaml
@@ -6,6 +6,8 @@
 description: >-
   Hafnium is the Secure Partition Manager that runs at SEL2.
 
+image: shrinkwraptool/base-full
+
 build:
   hafnium:
     repo:
diff --git a/docker/build.sh b/docker/build.sh
index 48f5fd755d534ab9fb48026b5dc9fcedf21b3e81..8191faa85f725f47b18623734dccc93999085750 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -108,8 +108,8 @@ if [ "${ARCH}" = "x86_64" ]; then
 	TCH_PKG_URL_AARCH32=https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel
 	TCH_PKG_NAME_AARCH32=arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz
 	TCH_PATH_AARCH32=arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi/bin
-	FVP_PKG_URL=https://developer.arm.com/-/cdn-downloads/permalink/Fixed-Virtual-Platforms/FM-11.27
-	FVP_PKG_NAME=FVP_Base_RevC-2xAEMvA_11.27_19_Linux64.tgz
+	FVP_PKG_URL=https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.28
+	FVP_PKG_NAME=FVP_Base_RevC-2xAEMvA_11.28_23_Linux64.tgz
 	FVP_MODEL_DIR=Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3
 # ARCH is "aarch64" on Ubuntu, or "arm64" on Mac OS
 elif [ "${ARCH}" = "aarch64" ] || [ "${ARCH}" = "arm64" ]; then
@@ -122,8 +122,8 @@ elif [ "${ARCH}" = "aarch64" ] || [ "${ARCH}" = "arm64" ]; then
 	TCH_PKG_URL_AARCH32=https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel
 	TCH_PKG_NAME_AARCH32=arm-gnu-toolchain-13.2.rel1-aarch64-arm-none-eabi.tar.xz
 	TCH_PATH_AARCH32=arm-gnu-toolchain-13.2.Rel1-aarch64-arm-none-eabi/bin
-	FVP_PKG_URL=https://developer.arm.com/-/cdn-downloads/permalink/Fixed-Virtual-Platforms/FM-11.27
-	FVP_PKG_NAME=FVP_Base_RevC-2xAEMvA_11.27_19_Linux64_armv8l.tgz
+	FVP_PKG_URL=https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.28
+	FVP_PKG_NAME=FVP_Base_RevC-2xAEMvA_11.28_23_Linux64_armv8l.tgz
 	FVP_MODEL_DIR=Base_RevC_AEMvA_pkg/models/Linux64_armv8l_GCC-9.3
 else
 	echo "Host architecture ${ARCH} not supported"