diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml
index 26abea99ab..81b457cf89 100644
--- a/ansible/roles/common/defaults/main.yml
+++ b/ansible/roles/common/defaults/main.yml
@@ -6,9 +6,9 @@ common_run: False
 ####################
 # Docker
 ####################
-ansible_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kolla-toolbox"
-ansible_tag: "{{ openstack_release }}"
-ansible_image_full: "{{ ansible_image }}:{{ ansible_tag }}"
+kolla_toolbox_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kolla-toolbox"
+kolla_toolbox_tag: "{{ openstack_release }}"
+kolla_toolbox_image_full: "{{ kolla_toolbox_image }}:{{ kolla_toolbox_tag }}"
 
 heka_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-heka"
 heka_tag: "{{ openstack_release }}"
diff --git a/ansible/roles/common/tasks/pull.yml b/ansible/roles/common/tasks/pull.yml
index e823320a41..e19971ce68 100644
--- a/ansible/roles/common/tasks/pull.yml
+++ b/ansible/roles/common/tasks/pull.yml
@@ -3,7 +3,7 @@
   kolla_docker:
     action: "pull_image"
     common_options: "{{ docker_common_options }}"
-    image: "{{ ansible_image_full }}"
+    image: "{{ kolla_toolbox_image_full }}"
 
 - name: Pulling heka image
   kolla_docker:
diff --git a/ansible/roles/common/tasks/start.yml b/ansible/roles/common/tasks/start.yml
index 955103eb14..1498fc7f23 100644
--- a/ansible/roles/common/tasks/start.yml
+++ b/ansible/roles/common/tasks/start.yml
@@ -22,7 +22,7 @@
     environment:
       ANSIBLE_NOCOLOR: "1"
       ANSIBLE_LIBRARY: "/usr/share/ansible"
-    image: "{{ ansible_image_full }}"
+    image: "{{ kolla_toolbox_image_full }}"
     name: "kolla_toolbox"
     privileged: True
     volumes: