diff --git a/doc/source/admin/image-building.rst b/doc/source/admin/image-building.rst
index 279f02b78d..97f2ba8aca 100644
--- a/doc/source/admin/image-building.rst
+++ b/doc/source/admin/image-building.rst
@@ -20,7 +20,8 @@ In general, images are built like this:
 
    kolla-build
 
-By default, the above command would build all images based on CentOS image.
+By default, the above command would build all images based on a CentOS Stream
+image.
 
 The operator can change the base distro with the ``-b`` option:
 
@@ -32,7 +33,7 @@ There are following distros (bases) available for building images:
 
 - centos
 - debian
-- rhel
+- rhel (deprecated)
 - ubuntu
 
 See the :ref:`support matrix <support-matrix-base-images>` for information on
diff --git a/doc/source/support_matrix.rst b/doc/source/support_matrix.rst
index 85b8f9e332..1025cf6e2c 100644
--- a/doc/source/support_matrix.rst
+++ b/doc/source/support_matrix.rst
@@ -14,14 +14,14 @@ Supported base images
 
 The following base container images are supported:
 
-============= ============ ================
-Distribution  Default base Default base tag
-============= ============ ================
-CentOS 8      centos       8
-Debian Buster debian       10
-RHEL 8        rhel         8
-Ubuntu Focal  ubuntu       20.04
-============= ============ ================
+================== =============================== ================
+Distribution       Default base                    Default base tag
+================== =============================== ================
+CentOS Stream 8    quay.io/centos/centos           stream8
+Debian Buster      debian                          bullseye
+RHEL8 (deprecated) registry.access.redhat.com/ubi8 latest
+Ubuntu Focal       ubuntu                          20.04
+================== =============================== ================
 
 The remainder of this document outlines which images are supported on which of
 these distribution.