diff --git a/doc/source/containers_deployment/architecture.rst b/doc/source/containers_deployment/architecture.rst
index fe90cf7f..3d0aa1f9 100644
--- a/doc/source/containers_deployment/architecture.rst
+++ b/doc/source/containers_deployment/architecture.rst
@@ -43,13 +43,15 @@ of the services, like mariadb::
 Use the following command to build an image using kolla-build and the template
 above (`template-overrides.j2`)::
 
-  $ kolla-build --base centos --template-override template-overrides.j2
+  $ kolla-build --base centos \
+    --template-override /usr/share/tripleo-common/container-images/tripleo_kolla_template_overrides.j2 \
+    --template-override template-overrides.j2
 
 TripleO maintains its complete list of kolla customization in the
 `tripleo-common`_ project.
 
 .. _Kolla: https://docs.openstack.org/developer/kolla/image-building.html#dockerfile-customisation
-.. _tripleo-common: https://github.com/openstack/tripleo-common/blob/master/contrib/tripleo_kolla_template_overrides.j2
+.. _tripleo-common: https://github.com/openstack/tripleo-common/blob/master/container-images/tripleo_kolla_template_overrides.j2
 
 heat-config-docker-cmd
 ----------------------
diff --git a/doc/source/containers_deployment/overcloud.rst b/doc/source/containers_deployment/overcloud.rst
index 6d8054de..1b5c5fe1 100644
--- a/doc/source/containers_deployment/overcloud.rst
+++ b/doc/source/containers_deployment/overcloud.rst
@@ -55,7 +55,7 @@ dockerhub, use the following command::
 
 Or use `kolla-build` to build the images yourself::
 
-    kolla-build --base centos --type binary --namespace tripleoupstream --registry 192.168.24.1:8787 --tag latest --template-override /usr/share/tripleo-common/contrib/tripleo_kolla_template_overrides.j2 --push
+    kolla-build --base centos --type binary --namespace tripleoupstream --registry 192.168.24.1:8787 --tag latest --template-override /usr/share/tripleo-common/container-images/tripleo_kolla_template_overrides.j2 --push
 
 Finally, point the heat templates to your local registry, for example in
 a `$HOME/docker_registry.yaml` file::
diff --git a/doc/source/containers_deployment/tips_tricks.rst b/doc/source/containers_deployment/tips_tricks.rst
index 2cd00968..6f8dfeac 100644
--- a/doc/source/containers_deployment/tips_tricks.rst
+++ b/doc/source/containers_deployment/tips_tricks.rst
@@ -164,11 +164,9 @@ Testing in CI
 -------------
 
 When new service containers are added, ensure to update the image names in
-`contrib/overcloud_containers.yaml` tripleo-common repo. These service
+`container-images/overcloud_containers.yaml` tripleo-common repo. These service
 images are pulled in and available in the local docker registry that the
 containers ci job uses::
 
     uploads:
         - imagename: tripleoupstream/centos-binary-example:latest
-          uploader: docker
-          pull_source: docker.io