diff --git a/docker/build.sh b/docker/build.sh
index ee9020c9c3096a71bda4b2dcd446b7372edc3d55..e239b1d900bfaf313c3665d2d1c4a3a1c30f7322 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -48,7 +48,10 @@ elif [ "${ARCH}" == "aarch64" ]; then
 	TCH_PKG_URL_AARCH32=https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel
 	TCH_PKG_NAME_AARCH32=arm-gnu-toolchain-11.3.rel1-aarch64-arm-none-eabi.tar.xz
 	TCH_PATH_AARCH32=arm-gnu-toolchain-11.3.rel1-aarch64-arm-none-eabi/bin
-	FVP_PKG_NAME=none
+	FVP_PKG_URL=https://developer.arm.com/-/media/Files/downloads/ecosystem-models
+	FVP_PKG_NAME=FVP_Base_RevC-2xAEMvA_11.20_15_Linux64_armv8l.tgz
+	FVP_MODEL_DIR=Base_RevC_AEMvA_pkg/models/Linux64_armv8l_GCC-9.3
+	FVP_PLUGIN_DIR=Base_RevC_AEMvA_pkg/plugins/Linux64_armv8l_GCC-9.3
 else
 	echo "Host architecture ${ARCH} not supported"
 	exit 1
@@ -59,11 +62,7 @@ echo "Building for version ${VERSION} for ${ARCH}..."
 # Build the image.
 wget -q -O ${TCH_PKG_NAME_AARCH64} ${TCH_PKG_URL_AARCH64}/${TCH_PKG_NAME_AARCH64}
 wget -q -O ${TCH_PKG_NAME_AARCH32} ${TCH_PKG_URL_AARCH32}/${TCH_PKG_NAME_AARCH32}
-if [ "${FVP_PKG_NAME}" != "none" ]; then
-	wget -q -O ${FVP_PKG_NAME} ${FVP_PKG_URL}/${FVP_PKG_NAME}
-else
-	touch ${FVP_PKG_NAME}
-fi
+wget -q -O ${FVP_PKG_NAME} ${FVP_PKG_URL}/${FVP_PKG_NAME}
 docker build \
 	--build-arg=BASE=docker.io/library/debian:bullseye-slim \
 	--build-arg=TCH_PKG_NAME_AARCH64=${TCH_PKG_NAME_AARCH64} \