diff --git a/ci-dockerfiles-deployment/builders.sh b/ci-dockerfiles-deployment/builders.sh
index 6030115..3977465 100644
--- a/ci-dockerfiles-deployment/builders.sh
+++ b/ci-dockerfiles-deployment/builders.sh
@@ -42,7 +42,7 @@
 cd dockerfiles/
 
 aws configure list
-aws s3 cp --recursive s3://trustedfirmware-private/armclang/ .
+aws s3 cp --recursive s3://openci-trustedfirmware-private-${INFRA_ENV}/armclang/ .
 find .
 
 df -h
diff --git a/fvp-docker-images/builders.sh b/fvp-docker-images/builders.sh
index e629eb8..27d1581 100644
--- a/fvp-docker-images/builders.sh
+++ b/fvp-docker-images/builders.sh
@@ -17,9 +17,9 @@
 git log -1
 
 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
+export ECR=${PRIVATE_CONTAINER_REGISTRY}
+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
 
 
 for tarball in F*.tgz
diff --git a/iar-docker-images/builders.sh b/iar-docker-images/builders.sh
index ce2e29a..c212cdd 100755
--- a/iar-docker-images/builders.sh
+++ b/iar-docker-images/builders.sh
@@ -16,14 +16,14 @@
 fi
 
 aws configure list
-ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com
-export IAR_ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com/iar
+export ECR=${PRIVATE_CONTAINER_REGISTRY}
+export IAR_ECR=${PRIVATE_CONTAINER_REGISTRY}/iar
 # Get armclang toolchain
-aws s3 cp --recursive s3://trustedfirmware-private/armclang/ .
+aws s3 cp --recursive s3://openci-trustedfirmware-private-${INFRA_ENV}/armclang/ .
 # Get IAR toolchain binary
-aws s3 cp --recursive s3://trustedfirmware-iar/ .
+aws s3 cp --recursive s3://openci-trustedfirmware-iar-${INFRA_ENV}/ .
 find .
-aws ecr get-login-password --region us-east-1|docker login --username AWS --password-stdin $ECR
+aws ecr get-login-password --region eu-west-1|docker login --username AWS --password-stdin $ECR
 
 image=$(dirname $(find . -name build.sh))
 test -d $image  && test -f $image/build.sh && \
diff --git a/iar-docker-images/update.sh b/iar-docker-images/update.sh
index 3f8fc34..30e93c0 100755
--- a/iar-docker-images/update.sh
+++ b/iar-docker-images/update.sh
@@ -14,11 +14,11 @@
 fi
 
 aws configure list
-export ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com
+export ECR=${PRIVATE_CONTAINER_REGISTRY}
 export REPO=iar
-aws ecr get-login-password --region us-east-1|docker login --username AWS --password-stdin $ECR
+aws ecr get-login-password --region eu-west-1|docker login --username AWS --password-stdin $ECR
 
-for image in $(aws ecr list-images --region us-east-1 --repository-name $REPO | \
+for image in $(aws ecr list-images --region eu-west-1 --repository-name $REPO | \
     grep imageTag | \
     awk '{print $2}' | \
     sed 's/"//g'); do
diff --git a/misra-docker-images/builders.sh b/misra-docker-images/builders.sh
index 977d4c9..c4bbffd 100755
--- a/misra-docker-images/builders.sh
+++ b/misra-docker-images/builders.sh
@@ -14,12 +14,12 @@
 cd misra-dockerfiles
 
 aws configure list
-export ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com
+export ECR=${PRIVATE_CONTAINER_REGISTRY}
 # we are expecting private files to be kept in the dockerfiles/*
 # subdirs with a matching name for the image
-aws s3 cp --recursive s3://trustedfirmware-misra/dockerfiles/ .
+aws s3 cp --recursive s3://openci-trustedfirmware-misra-${INFRA_ENV}/dockerfiles/ .
 find .
-aws ecr get-login-password --region us-east-1|docker login --username AWS --password-stdin $ECR
+aws ecr get-login-password --region eu-west-1|docker login --username AWS --password-stdin $ECR
 
 
 was_error=0
diff --git a/misra-docker-images/update.sh b/misra-docker-images/update.sh
index f185817..344f082 100755
--- a/misra-docker-images/update.sh
+++ b/misra-docker-images/update.sh
@@ -14,11 +14,11 @@
 fi
 
 aws configure list
-export ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com
+export ECR=${PRIVATE_CONTAINER_REGISTRY}
 export REPO=misra
-aws ecr get-login-password --region us-east-1|docker login --username AWS --password-stdin $ECR
+aws ecr get-login-password --region eu-west-1|docker login --username AWS --password-stdin $ECR
 
-for image in $(aws ecr list-images --region us-east-1 --repository-name $REPO | \
+for image in $(aws ecr list-images --region eu-west-1 --repository-name $REPO | \
     grep imageTag | \
     awk '{print $2}' | \
     sed 's/"//g'); do