diff --git a/ansible/roles/freezer/defaults/main.yml b/ansible/roles/freezer/defaults/main.yml
index 51e32c4a5d..5112e76df9 100644
--- a/ansible/roles/freezer/defaults/main.yml
+++ b/ansible/roles/freezer/defaults/main.yml
@@ -27,13 +27,16 @@ freezer_services:
 ####################
 # Docker
 ####################
-freezer_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-freezer-api"
-freezer_api_tag: "{{ openstack_release }}"
-freezer_api_image_full: "{{ freezer_api_image }}:{{ freezer_api_tag }}"
-freezer_scheduler_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-freezer-scheduler"
-freezer_scheduler_tag: "{{ openstack_release }}"
-freezer_scheduler_image_full: "{{ freezer_scheduler_image }}:{{ freezer_scheduler_tag }}"
+freezer_install_type: "{{ kolla_install_type }}"
+freezer_tag: "{{ openstack_release }}"
 
+freezer_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ freezer_install_type }}-freezer-api"
+freezer_api_tag: "{{ freezer_tag }}"
+freezer_api_image_full: "{{ freezer_api_image }}:{{ freezer_api_tag }}"
+
+freezer_scheduler_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ freezer_install_type }}-freezer-scheduler"
+freezer_scheduler_tag: "{{ freezer_tag }}"
+freezer_scheduler_image_full: "{{ freezer_scheduler_image }}:{{ freezer_scheduler_tag }}"
 
 ####################
 # OpenStack