diff --git a/ansible/roles/trove/defaults/main.yml b/ansible/roles/trove/defaults/main.yml
index 24e6887a9a..c3221f30f2 100644
--- a/ansible/roles/trove/defaults/main.yml
+++ b/ansible/roles/trove/defaults/main.yml
@@ -45,16 +45,19 @@ trove_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
 ####################
 # Docker
 ####################
-trove_conductor_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-trove-conductor"
-trove_conductor_tag: "{{ openstack_release }}"
+trove_install_type: "{{ kolla_install_type }}"
+trove_tag: "{{ openstack_release }}"
+
+trove_conductor_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ trove_install_type }}-trove-conductor"
+trove_conductor_tag: "{{ trove_tag }}"
 trove_conductor_image_full: "{{ trove_conductor_image }}:{{ trove_conductor_tag }}"
 
-trove_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-trove-api"
-trove_api_tag: "{{ openstack_release }}"
+trove_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ trove_install_type }}-trove-api"
+trove_api_tag: "{{ trove_tag }}"
 trove_api_image_full: "{{ trove_api_image }}:{{ trove_api_tag }}"
 
-trove_taskmanager_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-trove-taskmanager"
-trove_taskmanager_tag: "{{ openstack_release }}"
+trove_taskmanager_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ trove_install_type }}-trove-taskmanager"
+trove_taskmanager_tag: "{{ trove_tag }}"
 trove_taskmanager_image_full: "{{ trove_taskmanager_image }}:{{ trove_taskmanager_tag }}"
 
 
diff --git a/ansible/roles/watcher/defaults/main.yml b/ansible/roles/watcher/defaults/main.yml
index b1c13b881b..53e9f108cf 100644
--- a/ansible/roles/watcher/defaults/main.yml
+++ b/ansible/roles/watcher/defaults/main.yml
@@ -42,16 +42,19 @@ watcher_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
 ####################
 # Docker
 ####################
-watcher_engine_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-watcher-engine"
-watcher_engine_tag: "{{ openstack_release }}"
+watcher_install_type: "{{ kolla_install_type }}"
+watcher_tag: "{{ openstack_release }}"
+
+watcher_engine_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ watcher_install_type }}-watcher-engine"
+watcher_engine_tag: "{{ watcher_tag }}"
 watcher_engine_image_full: "{{ watcher_engine_image }}:{{ watcher_engine_tag }}"
 
-watcher_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-watcher-api"
-watcher_api_tag: "{{ openstack_release }}"
+watcher_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ watcher_install_type }}-watcher-api"
+watcher_api_tag: "{{ watcher_tag }}"
 watcher_api_image_full: "{{ watcher_api_image }}:{{ watcher_api_tag }}"
 
-watcher_applier_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-watcher-applier"
-watcher_applier_tag: "{{ openstack_release }}"
+watcher_applier_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ watcher_install_type }}-watcher-applier"
+watcher_applier_tag: "{{ watcher_tag }}"
 watcher_applier_image_full: "{{ watcher_applier_image }}:{{ watcher_applier_tag }}"
 
 ####################
diff --git a/ansible/roles/zun/defaults/main.yml b/ansible/roles/zun/defaults/main.yml
index 022ac70b98..45acdcf505 100644
--- a/ansible/roles/zun/defaults/main.yml
+++ b/ansible/roles/zun/defaults/main.yml
@@ -35,12 +35,15 @@ zun_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
 ####################
 ## Docker
 ####################
-zun_compute_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-zun-compute"
-zun_compute_tag: "{{ openstack_release }}"
+zun_install_type: "{{ kolla_install_type }}"
+zun_tag: "{{ openstack_release }}"
+
+zun_compute_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ zun_install_type }}-zun-compute"
+zun_compute_tag: "{{ zun_tag }}"
 zun_compute_image_full: "{{ zun_compute_image }}:{{ zun_compute_tag }}"
 
-zun_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-zun-api"
-zun_api_tag: "{{ openstack_release }}"
+zun_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ zun_install_type }}-zun-api"
+zun_api_tag: "{{ zun_tag }}"
 zun_api_image_full: "{{ zun_api_image }}:{{ zun_api_tag }}"