diff --git a/roles/extras-common/README.md b/roles/extras-common/README.md
index 901df9ddf..f0efe95a7 100644
--- a/roles/extras-common/README.md
+++ b/roles/extras-common/README.md
@@ -27,3 +27,9 @@ Role Variables
   roles. Can be disabled by specifying this command as an empty string.
 - `enable_libvirt_tripleo_ui`: <false> -- update the triple-ui javascript config
   for libvirt environments.
+- `local_docker_registry_host`: <"{{undercloud_network_gateway|default(undercloud_network_cidr|nthhost(1))}}"> -- host of the local (undercloud) docker registry
+- `docker_registry_host`: <'docker.io'> -- host of the primary docker registry
+- `docker_registry_namespace`: <'tripleoupstream'> -- namespace of
+  docker images used for TripleO deployment
+- `docker_image_tag`: <'latest'> -- tag of docker images used for
+  TripleO deployment
diff --git a/roles/extras-common/defaults/main.yml b/roles/extras-common/defaults/main.yml
index 120bc29d9..e7b37db71 100644
--- a/roles/extras-common/defaults/main.yml
+++ b/roles/extras-common/defaults/main.yml
@@ -2,8 +2,12 @@
 
 overcloud_ipv6: false
 containerized_overcloud: false
-deployed_server: false
 containerized_overcloud_upgrade: false
+local_docker_registry_host: "{{undercloud_network_gateway|default(undercloud_network_cidr|nthhost(1))}}"
+docker_registry_namespace: tripleoupstream
+docker_registry_host: docker.io
+docker_image_tag: latest
+deployed_server: false
 overcloud_templates_path: /usr/share/openstack-tripleo-heat-templates
 enable_tls_everywhere: false
 undercloud_generate_service_certificate: false
diff --git a/roles/overcloud-prep-containers/README.md b/roles/overcloud-prep-containers/README.md
index 11767be29..a1a697563 100644
--- a/roles/overcloud-prep-containers/README.md
+++ b/roles/overcloud-prep-containers/README.md
@@ -29,9 +29,6 @@ overcloud-prep-containers variables
 * overcloud_prep_containers_script: overcloud-prep-containers.sh.j2
 * overcloud_prep_containers_log: overcloud_prep_containers.log
 * undercloud_network_cidr: 192.168.24.0/24
-* ctl_plane_ip: "{{undercloud_network_gateway|default(undercloud_network_cidr|nthhost(1))}}"
-* docker_registry_host: docker.io
-* docker_image_tag: latest
 
 overcloud-prep-config variables
 -------------------------------
diff --git a/roles/overcloud-prep-containers/defaults/main.yml b/roles/overcloud-prep-containers/defaults/main.yml
index bdf386ff7..2107ca429 100644
--- a/roles/overcloud-prep-containers/defaults/main.yml
+++ b/roles/overcloud-prep-containers/defaults/main.yml
@@ -4,10 +4,6 @@ tripleo_common_dir: /usr/share/openstack-tripleo-common
 containerized_overcloud: false
 overcloud_prep_containers_script: overcloud-prep-containers.sh.j2
 overcloud_prep_containers_log: overcloud_prep_containers.log
-ctl_plane_ip: "{{undercloud_network_gateway|default(undercloud_network_cidr|nthhost(1))}}"
-docker_registry_namespace: tripleoupstream
-docker_registry_host: docker.io
-docker_image_tag: latest
 # Be careful with this setting as it entirely wipes the /var/lib/docker directory
 # Useful in CI to workaround disk space issue
 # https://bugs.launchpad.net/tripleo/+bug/1694709
diff --git a/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2 b/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
index 2169bb8f7..aa0e8e4c7 100644
--- a/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
+++ b/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
@@ -21,7 +21,7 @@ openstack overcloud container image prepare \
     --tag {{ docker_image_tag }} \
     --pull-source {{ docker_registry_host }} \
     --exclude ceph \
-    --push-destination {{ ctl_plane_ip }}:8787
+    --push-destination {{ local_docker_registry_host }}:8787
 
 openstack overcloud container image upload --verbose --config-file {{ working_dir }}/overcloud_containers.yaml
 
@@ -40,9 +40,9 @@ sudo systemctl start docker
 
 openstack overcloud container image prepare \
     --env-file {{ working_dir }}/containers-default-parameters.yaml \
-    --namespace {{ ctl_plane_ip }}:8787/{{ docker_registry_namespace }}
+    --namespace {{ local_docker_registry_host }}:8787/{{ docker_registry_namespace }}
 
-echo "  DockerInsecureRegistryAddress: {{ ctl_plane_ip }}:8787" >> \
+echo "  DockerInsecureRegistryAddress: {{ local_docker_registry_host }}:8787" >> \
     {{ working_dir }}/containers-default-parameters.yaml
 
 echo "============================="
diff --git a/roles/overcloud-upgrade/templates/major-upgrade-overcloud-containers.sh.j2 b/roles/overcloud-upgrade/templates/major-upgrade-overcloud-containers.sh.j2
index e5f51ced1..14afde47b 100644
--- a/roles/overcloud-upgrade/templates/major-upgrade-overcloud-containers.sh.j2
+++ b/roles/overcloud-upgrade/templates/major-upgrade-overcloud-containers.sh.j2
@@ -17,12 +17,14 @@ source {{ upgrade_working_dir }}/stackrc
 openstack overcloud container image prepare \
     --images-file {{ upgrade_working_dir }}/overcloud_containers.yaml \
     --namespace {{ docker_registry_namespace }} \
-    --push-destination {{ ctl_plane_ip }}:8787
+    --push-destination {{ local_docker_registry_host }}:8787
 
 openstack overcloud container image prepare \
     --env-file ~/containers-default-parameters.yaml \
-    --namespace {{ ctl_plane_ip }}:8787/{{ docker_registry_namespace }}
+    --namespace {{ local_docker_registry_host }}:8787/{{ docker_registry_namespace }}
 
+echo "  DockerInsecureRegistryAddress: {{ local_docker_registry_host }}:8787" >> \
+    ~/containers-default-parameters.yaml
 {% endif %}
 
 {% if target_upgrade_version in ['pike', 'master'] %}