diff --git a/roles/compute-node-config/templates/openstack-compute-vtn.yaml.j2 b/roles/compute-node-config/templates/openstack-compute-vtn.yaml.j2
index 88ab8d1..a61c54f 100644
--- a/roles/compute-node-config/templates/openstack-compute-vtn.yaml.j2
+++ b/roles/compute-node-config/templates/openstack-compute-vtn.yaml.j2
@@ -28,10 +28,12 @@
 
 # VTN networking for OpenStack Compute Nodes
 {% for node in groups['compute'] %}
-{% if 'ipv4' in hostvars[node]['ansible_' ~ compute_external_interface] %}
-{% set node_interface = hostvars[node]['ansible_' ~ compute_external_interface] %}
+{% for ext_if in compute_external_interfaces %}
+{% set ansible_ext_if = 'ansible_' ~ ext_if | regex_replace('\W', '_') %}
+{% if hostvars[node][ansible_ext_if] is defined and 'ipv4' in hostvars[node][ansible_ext_if] %}
+{% set node_interface = hostvars[node][ansible_ext_if] %}
 
-# Compute node, fully defined in compute-nodes.yaml
+# Compute node: {{ node }}, with interface {{ ansible_ext_if }}
     {{ hostvars[node]['ansible_hostname'] }}:
       type: tosca.nodes.Node
       properties:
@@ -112,6 +114,8 @@
             node: service#ONOS_Fabric
             relationship: tosca.relationships.MemberOfService
 {% endif %}
+
 {% endif %}
 {% endfor %}
+{% endfor %}
 
diff --git a/roles/compute-node-config/templates/openstack-compute.yaml.j2 b/roles/compute-node-config/templates/openstack-compute.yaml.j2
index 0a4fb9c..6e76a43 100644
--- a/roles/compute-node-config/templates/openstack-compute.yaml.j2
+++ b/roles/compute-node-config/templates/openstack-compute.yaml.j2
@@ -25,7 +25,12 @@
 
 # OpenStack compute nodes
 {% for node in groups['compute'] %}
-{% if 'ipv4' in hostvars[node]['ansible_' ~ compute_external_interface] %}
+{% for ext_if in compute_external_interfaces %}
+{% set ansible_ext_if = 'ansible_' ~ ext_if | regex_replace('\W', '_') %}
+{% if hostvars[node][ansible_ext_if] is defined and 'ipv4' in hostvars[node][ansible_ext_if] %}
+{% set node_interface = hostvars[node][ansible_ext_if] %}
+
+# Compute node: {{ node }}, with interface {{ ansible_ext_if }}
     {{ hostvars[node]['ansible_hostname'] }}:
       type: tosca.nodes.Node
       requirements:
@@ -38,4 +43,5 @@
 
 {% endif %}
 {% endfor %}
+{% endfor %}