diff --git a/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/pre.yaml b/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/pre.yaml
index 4c98904..a06f1de 100644
--- a/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/pre.yaml
+++ b/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/pre.yaml
@@ -122,15 +122,13 @@
 
     - name: Find the Name of Interface for 'network_interface'
       set_fact:
-        # TODO: Overrides var in vars.yaml
-        network_interface: "{{ item }}"
+        kolla_network_interface: "{{ item }}"
       loop: "{{ ansible_interfaces }}"
       when: ansible_facts[item]['macaddress']|default(None) == hostvars['undercloud-client']['kolla_network_interface_port_info_mac']
 
-    - name: Find the Name of Interface for 'neutron_external_interface'
+    - name: Find the Name of Interface for 'network_interface'
       set_fact:
-        # TODO: Overrides var in vars.yaml
-        neutron_external_interface: "{{ item }}"
+        kolla_neutron_external_interface: "{{ item }}"
       loop: "{{ ansible_interfaces }}"
       when: ansible_facts[item]['macaddress']|default(None) == hostvars['undercloud-client']['kolla_neutron_external_interface_port_mac']