diff --git "a/\173\043 interfaces \043\175/bond0_ab_ovs_vxlan_mesh_no_tag" "b/\173\043 interfaces \043\175/bond0_ab_ovs_vxlan_mesh_no_tag"
new file mode 100644
index 0000000..7e8ade8
--- /dev/null
+++ "b/\173\043 interfaces \043\175/bond0_ab_ovs_vxlan_mesh_no_tag"
@@ -0,0 +1,48 @@
+{#- Tenant over VXLAN. For gateway nodes. Used for virtual deploys. #}
+{#- Because we don't use tagging of switch ports, we shouldn't use tag on br-mesh#}
+{#- Provides:                         #}
+{#-   br_mesh (OVS bridge) + tenant address #}
+{#- Requirements:                     #}
+{#-   _param:tenant_address         #}
+{#-   _param:tenant_netmask         #}
+{#-   _param:tenant_vlan           #}
+              # {{ interfaces_role }}
+              {{- set_param('linux_network_bridge', 'openvswitch') }}
+              {%- for interface_name, interface in interfaces.items() %}
+              {{ interface_name }}:
+                mtu: 9000
+                enabled: true
+                master: bond0  # ?
+                name: {{ interface_name }}
+                proto: manual
+                type: slave  # ?
+                ipflush_onchange: true
+              {%- endfor %}
+              bond0:
+                enabled: true
+                mode: active-backup
+                ovs_bridge: br-ten
+                ovs_type: OVSPort
+                proto: manual
+                slaves: {{ ' '.join(interfaces.keys()) }}
+                type: bond
+                use_interfaces:
+                {%- for interface_name in interfaces.keys() %}
+                - {{ interface_name }}
+                {%- endfor %}
+                require_interfaces:
+                {%- for interface_name in interfaces.keys() %}
+                - {{ interface_name }}
+                {%- endfor %}
+              br-ten:
+                enabled: true
+                type: ovs_bridge
+              br-mesh:
+                enabled: true
+                type: ovs_port
+                bridge: br-ten
+                proto: static
+                address: ${_param:_esc}{_param:tenant_address}
+                netmask: ${_param:_esc}{_param:tenant_network_netmask}
+                require_interfaces:
+                - br-ten
diff --git "a/\173\043 interfaces \043\175/single_ovs_br_floating" "b/\173\043 interfaces \043\175/single_ovs_br_floating"
index 3f8281d..b66b73d 100644
--- "a/\173\043 interfaces \043\175/single_ovs_br_floating"
+++ "b/\173\043 interfaces \043\175/single_ovs_br_floating"
@@ -30,9 +30,9 @@
                 {%- if 'mtu' in interface %}
                 mtu: {{ interface['mtu'] }}
                 {%- endif %}
-                address: ${_param:external_address}
+                address: ${_param:_esc}{_param:external_address}
                 netmask: 255.255.255.0
                 use_interfaces:
                 - {{ interface_name }}
                 use_ovs_ports:
-                - float-to-ex
\ No newline at end of file
+                - float-to-ex