diff --git a/deploy-guide/source/deployment/undercloud.rst b/deploy-guide/source/deployment/undercloud.rst
index 5079b8c6..29742d5c 100644
--- a/deploy-guide/source/deployment/undercloud.rst
+++ b/deploy-guide/source/deployment/undercloud.rst
@@ -5,11 +5,13 @@ The requirements for a containerized undercloud are the same as for any other
 undercloud deployment. The real difference is in where the undercloud services
 will be deployed (containers vs base OS).
 
-The undercloud architecture based on Moby_ containers is not very different from
-the baremetal/VM based one. The services deployed in the traditional baremetal
-undercloud are also deployed in the containers based one.
+The undercloud architecture based on Moby_ (also Podman_ as of Stein) containers
+is not very different from the baremetal/VM based one. The services deployed in
+the traditional baremetal undercloud are also deployed in the containers based
+one.
 
 .. _Moby: https://mobyproject.org/
+.. _Podman: https://podman.io/
 
 One obvious difference between these two types of deployments is that the
 openstack services are deployed as containers in a container runtime rather than
diff --git a/doc/source/contributor/new_developers.rst b/doc/source/contributor/new_developers.rst
index aa4b4f33..f2bff2d8 100644
--- a/doc/source/contributor/new_developers.rst
+++ b/doc/source/contributor/new_developers.rst
@@ -131,5 +131,6 @@ development using this framework instead of a complete overcloud.
 This is very useful if you are developing Heat templates or containerized
 services.
 
-Please see the following guide on how to set up a containerized undercloud:
-https://docs.openstack.org/tripleo-docs/latest/install/containers_deployment/undercloud.html
+Please see `Undercloud Deployment Guide <https://docs.openstack.org/project-deploy-guide/tripleo-docs/latest/deployment/undercloud.html>`_
+on how to set up a containerized undercloud.
+