diff --git a/fvp-docker-images/builders.sh b/fvp-docker-images/builders.sh
index 62e6cee..ff475c1 100644
--- a/fvp-docker-images/builders.sh
+++ b/fvp-docker-images/builders.sh
@@ -1,6 +1,35 @@
 #!/bin/bash
+set -e
+
+sudo apt-get -y -qq update
+sudo apt-get -y -qq install --no-install-recommends unzip
+curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+unzip awscliv2.zip
+sudo ./aws/install
+
+aws configure list
+ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com
+git clone https://gitlab.com/suihkulokki/fvp-docker
+cd fvp-docker
 
 aws s3 cp --recursive s3://trustedfirmware-fvp/ .
-aws ecr get-login-password --region us-east-1|docker login --username AWS --password-stdin 987685672616.dkr.ecr.us-east-1.amazonaws.com
-docker pull 987685672616.dkr.ecr.us-east-1.amazonaws.com/fvp:foundation_platform_11.10_22
+aws ecr get-login-password --region us-east-1|docker login --username AWS --password-stdin $ECR
+
+TGZS=$(F*.tgz)
+for tarball in TGZS
+do
+    tag=$(./create-model-tag.sh $tarball)
+    mkdir -p $tag
+    cp setup-sshd $tag/
+    ./create-model-dockerfile.sh $tarball $tag
+    (
+        set -ex
+        cd $tag
+        docker build --tag $ECR/fvp:$tag
+        echo "Docker image created" && \
+        echo "Docker image name: fvp:$${tag}"
+        docker push $ECR/fvp:$tag
+    )
+
+done