diff --git a/alfresco-docker-alfresco-pdf-renderer/Dockerfile b/alfresco-docker-alfresco-pdf-renderer/Dockerfile
index 4bc4843a..7781e2e0 100644
--- a/alfresco-docker-alfresco-pdf-renderer/Dockerfile
+++ b/alfresco-docker-alfresco-pdf-renderer/Dockerfile
@@ -3,7 +3,8 @@
 # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use.
 # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt.
 
-FROM alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate
+# TODO ATS-71 - remove quay.io once released (to dockerhub) (DEPLOY-574)
+FROM quay.io/alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate
 
 ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.1/alfresco-pdf-renderer-1.1-linux.tgz
 ENV PDFIUM_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/pdfium.txt
diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-docker-imagemagick/Dockerfile
index 40c50677..0178f6cd 100644
--- a/alfresco-docker-imagemagick/Dockerfile
+++ b/alfresco-docker-imagemagick/Dockerfile
@@ -3,7 +3,8 @@
 # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use.
 # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt.
 
-FROM alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate
+# TODO ATS-71 - remove quay.io once released (to dockerhub) (DEPLOY-574)
+FROM quay.io/alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate
 
 ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-linux.rpm
 ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-libs-linux.rpm
diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-docker-libreoffice/Dockerfile
index 8b0a3e8c..97f0a0ae 100644
--- a/alfresco-docker-libreoffice/Dockerfile
+++ b/alfresco-docker-libreoffice/Dockerfile
@@ -3,7 +3,8 @@
 # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use.
 # LibreOffice is from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt.
 
-FROM alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate
+# TODO ATS-71 - remove quay.io once released (to dockerhub) (DEPLOY-574)
+FROM quay.io/alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate
 
 ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/5.4.6/libreoffice-dist-5.4.6-linux.gz
 ENV LIBREOFFICE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/libreoffice.txt
diff --git a/alfresco-docker-tika/Dockerfile b/alfresco-docker-tika/Dockerfile
index 1cef5d4c..0c21a172 100644
--- a/alfresco-docker-tika/Dockerfile
+++ b/alfresco-docker-tika/Dockerfile
@@ -3,7 +3,8 @@
 # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use.
 # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0.
 
-FROM alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate
+# TODO ATS-71 - remove quay.io once released (to dockerhub) (DEPLOY-574)
+FROM quay.io/alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate
 
 ENV APACHE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt