diff --git a/fvp-docker-images/builders.sh b/fvp-docker-images/builders.sh
index 27d1581..f2ee305 100644
--- a/fvp-docker-images/builders.sh
+++ b/fvp-docker-images/builders.sh
@@ -21,8 +21,10 @@
 aws s3 cp --recursive s3://openci-trustedfirmware-fvp-${INFRA_ENV}/ .
 aws ecr get-login-password --region eu-west-1|docker login --username AWS --password-stdin $ECR
 
+fvp_versions=$(echo ${FVP_VERSIONS} | sed -e 's/ //g' -e 's/\./\\./g' -e 's/,/|/g')
+used_fvp=$(ls F*.tgz | grep -E "${fvp_versions}")
 
-for tarball in F*.tgz
+for tarball in "${used_fvp}"
 do
     df -h
     tag=$(./create-model-tag.sh $tarball)