diff --git a/doc/source/configuration/reference/kolla-ansible.rst b/doc/source/configuration/reference/kolla-ansible.rst
index f4ab06eed..8e14923a5 100644
--- a/doc/source/configuration/reference/kolla-ansible.rst
+++ b/doc/source/configuration/reference/kolla-ansible.rst
@@ -119,7 +119,7 @@ accessed.
     ``source``.
 ``kolla_docker_registry``
     URL of docker registry to use for Kolla images. Default is not set, in
-    which case Dockerhub will be used.
+    which case Quay.io will be used.
 ``kolla_docker_registry_insecure``
     Whether docker should be configured to use an insecure registry for Kolla
     images. Default is false, unless ``docker_registry_enabled`` is true and
diff --git a/doc/source/deployment.rst b/doc/source/deployment.rst
index 44563759b..fc70b587d 100644
--- a/doc/source/deployment.rst
+++ b/doc/source/deployment.rst
@@ -140,10 +140,10 @@ Building Container Images
 .. note::
 
    It is possible to use prebuilt container images from an image registry such
-   as Dockerhub.  In this case, this step can be skipped.
+   as Quay.io.  In this case, this step can be skipped.
 
 It is possible to use prebuilt container images from an image registry such as
-Dockerhub.  In some cases it may be necessary to build images locally either to
+Quay.io.  In some cases it may be necessary to build images locally either to
 apply local image customisation or to use a downstream version of kolla.
 Images are built by hosts in the ``container-image-builders`` group, which by
 default includes the ``seed``.
@@ -516,7 +516,7 @@ Building Container Images
 .. note::
 
    It is possible to use prebuilt container images from an image registry such
-   as Dockerhub.  In this case, this step can be skipped.
+   as Quay.io.  In this case, this step can be skipped.
 
 In some cases it may be necessary to build images locally either to apply local
 image customisation or to use a downstream version of kolla.  Images are built
@@ -548,12 +548,12 @@ Pulling Container Images
 .. note::
 
    It is possible to build container images locally avoiding the need for an
-   image registry such as Dockerhub.  In this case, this step can be skipped.
+   image registry such as Quay.io.  In this case, this step can be skipped.
 
-In most cases suitable prebuilt kolla images will be available on Dockerhub.
-The `kolla account <https://hub.docker.com/u/kolla>`_ provides image
-repositories suitable for use with kayobe and will be used by default.  To
-pull images from the configured image registry::
+In most cases suitable prebuilt kolla images will be available on Quay.io. The
+`openstack.kolla organisation <https://quay.io/organization/openstack.kolla>`_
+provides image repositories suitable for use with kayobe and will be used by
+default. To pull images from the configured image registry::
 
     (kayobe) $ kayobe overcloud container image pull
 
diff --git a/doc/source/upgrading.rst b/doc/source/upgrading.rst
index 9117e0db4..c7a3e245a 100644
--- a/doc/source/upgrading.rst
+++ b/doc/source/upgrading.rst
@@ -268,7 +268,7 @@ Building Container Images
 .. note::
 
    It is possible to use prebuilt container images from an image registry such
-   as Dockerhub.  In this case, this step can be skipped.
+   as Quay.io.  In this case, this step can be skipped.
 
 In some cases it may be necessary to build images locally either to apply local
 image customisation or to use a downstream version of kolla.  To build images
@@ -382,7 +382,7 @@ Building Container Images
 .. note::
 
    It is possible to use prebuilt container images from an image registry such
-   as Dockerhub.  In this case, this step can be skipped.
+   as Quay.io.  In this case, this step can be skipped.
 
 In some cases it may be necessary to build images locally either to apply local
 image customisation or to use a downstream version of kolla.  To build images
@@ -404,12 +404,12 @@ Pulling Container Images
 .. note::
 
    It is possible to build container images locally avoiding the need for an
-   image registry such as Dockerhub.  In this case, this step can be skipped.
+   image registry such as Quay.io.  In this case, this step can be skipped.
 
-In most cases suitable prebuilt kolla images will be available on Dockerhub.
-The `kolla account <https://hub.docker.com/u/kolla>`_ provides image
-repositories suitable for use with kayobe and will be used by default.  To
-pull images from the configured image registry::
+In most cases suitable prebuilt kolla images will be available on Quay.io. The
+`openstack.kolla organisation <https://quay.io/organization/openstack.kolla>`_
+provides image repositories suitable for use with kayobe and will be used by
+default. To pull images from the configured image registry::
 
     (kayobe) $ kayobe overcloud container image pull
 
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 34d5f7840..16714ec39 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -75,7 +75,7 @@
 #kolla_install_type:
 
 # URL of docker registry to use for Kolla images. Default is not set, in which
-# case Dockerhub will be used.
+# case Quay.io will be used.
 #kolla_docker_registry:
 
 # Docker namespace to use for Kolla images. Default is 'kolla'.