diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics_dvr.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics_dvr.j2
index dd0be22ee..b1783fe1f 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics_dvr.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics_dvr.j2
@@ -14,26 +14,26 @@ network_config:
 {% if network not in ["External", "Tenant"] %}
 - type: interface
   name: nic{{ loop.index +1 }}
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
   use_dhcp: false
   addresses:
   - ip_netmask:
-      {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-  routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+      {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% elif network == 'Tenant' %}
 - type: ovs_bridge
-  name: {{ 'br-' ~ role_networks_lower[network] }}
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+  name: {{ 'br-' ~ networks_lower[network] }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
   dns_servers: {{ ctlplane_dns_nameservers }}
   use_dhcp: false
   addresses:
   - ip_netmask:
-      {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-  routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+      {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
   members:
   - type: interface
     name: nic{{loop.index + 1}}
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
     use_dhcp: false
     primary: true
 {% endif %}
@@ -41,11 +41,17 @@ network_config:
 {% endfor %}
 - type: ovs_bridge
   name: {{ neutron_physical_bridge_name }}
-  mtu: {{ lookup('vars', role_networks_lower['External'] ~ '_mtu') }}
+  mtu: {{ lookup('vars', networks_lower['External'] ~ '_mtu') }}
   dns_servers: {{ ctlplane_dns_nameservers }}
   use_dhcp: false
+{% if 'External' in role_networks %}
+  addresses:
+  - ip_netmask:
+      {{ lookup('vars', networks_lower['External'] ~ '_ip') }}/{{ lookup('vars', networks_lower['External'] ~ '_cidr') }}
+  routes: {{ lookup('vars', networks_lower['External'] ~ '_host_routes') }}
+{% endif %}
   members:
   - type: interface
     name: nic{{nics_used[-1] + 1}}
-    mtu: {{ lookup('vars', role_networks_lower['External'] ~ '_mtu') }}
+    mtu: {{ lookup('vars', networks_lower['External'] ~ '_mtu') }}
     primary: true
diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans_dvr.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans_dvr.j2
index 6b2e79507..206fcacb0 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans_dvr.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans_dvr.j2
@@ -14,45 +14,54 @@ network_config:
 {% if network not in ["External", "Tenant"] %}
 - type: interface
   name: nic{{ loop.index + 1 }}
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
   use_dhcp: false
 - type: vlan
   device: nic{{ loop.index + 1 }}
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-  vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+  vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
   addresses:
   - ip_netmask:
-      {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-  routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+      {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% elif network == 'Tenant' %}
 - type: ovs_bridge
-  name: {{ 'br-' ~ role_networks_lower[network] }}
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+  name: {{ 'br-' ~ networks_lower[network] }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
   dns_servers: {{ ctlplane_dns_nameservers }}
   use_dhcp: false
   members:
   - type: interface
     name: nic{{ loop.index + 1 }}
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
     use_dhcp: false
     primary: true
   - type: vlan
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-    vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+    vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
     addresses:
     - ip_netmask:
-        {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-    routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+        {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+    routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% endif %}
 {% set _ = nics_used.append(loop.index) %}
 {% endfor %}
 - type: ovs_bridge
   name: {{ neutron_physical_bridge_name }}
-  mtu: {{ lookup('vars', role_networks_lower['External'] ~ '_mtu') }}
+  mtu: {{ lookup('vars', networks_lower['External'] ~ '_mtu') }}
   dns_servers: {{ ctlplane_dns_nameservers }}
   use_dhcp: false
   members:
   - type: interface
     name: nic{{nics_used[-1] + 1}}
-    mtu: {{ lookup('vars', role_networks_lower['External'] ~ '_mtu') }}
+    mtu: {{ lookup('vars', networks_lower['External'] ~ '_mtu') }}
     primary: true
+{% if 'External' in role_networks %}
+  - type: vlan
+    mtu: {{ lookup('vars', networks_lower['External'] ~ '_mtu') }}
+    vlan_id: {{ lookup('vars', networks_lower['External'] ~ '_vlan_id') }}
+    addresses:
+    - ip_netmask:
+        {{ lookup('vars', networks_lower['External'] ~ '_ip') }}/{{ lookup('vars', networks_lower['External'] ~ '_cidr') }}
+    routes: {{ lookup('vars', networks_lower['External'] ~ '_host_routes') }}
+{% endif %}