diff --git a/fvp-docker-images/builders.sh b/fvp-docker-images/builders.sh
index ff475c1..440182a 100644
--- a/fvp-docker-images/builders.sh
+++ b/fvp-docker-images/builders.sh
@@ -1,31 +1,36 @@
 #!/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
+if ! type aws
+then
+    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
+fi
 
-aws configure list
-ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com
+rm -rf fvp-docker
 git clone https://gitlab.com/suihkulokki/fvp-docker
 cd fvp-docker
 
+aws configure list
+ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com
 aws s3 cp --recursive s3://trustedfirmware-fvp/ .
 aws ecr get-login-password --region us-east-1|docker login --username AWS --password-stdin $ECR
 
-TGZS=$(F*.tgz)
-for tarball in TGZS
+
+for tarball in F*.tgz
 do
     tag=$(./create-model-tag.sh $tarball)
     mkdir -p $tag
     cp setup-sshd $tag/
+    mv $tarball $tag/
     ./create-model-dockerfile.sh $tarball $tag
     (
         set -ex
         cd $tag
-        docker build --tag $ECR/fvp:$tag
+        docker build --tag $ECR/fvp:$tag .
         echo "Docker image created" && \
         echo "Docker image name: fvp:$${tag}"
         docker push $ECR/fvp:$tag