diff --git a/network/network.j2 b/network/network.j2
index 9dc37f8af4..f8115fef63 100644
--- a/network/network.j2
+++ b/network/network.j2
@@ -63,12 +63,10 @@ parameters:
 {%- endif %}
     description: default route for the {{network.name_lower}} network
     type: string
-{%- if network.vlan %}
   {{network.name}}NetworkVlanID:
     default: {{network.vlan|default(1)}}
     description: Vlan ID for the {{network.name_lower}} network traffic.
     type: number
-{%- endif %}
   {{network.name}}Routes:
     default: {{network.routes|default([])}}
     description: >
@@ -170,6 +168,14 @@ resources:
         map_merge:
           - {get_param: {{network.name}}NetValueSpecs}
           - {'mtu': {get_param: {{network.name}}Mtu}}
+      tags:
+        - tripleo_vip={{network.vip|default(false)}}
+{%- if network.service_net_map_replace|default('') %}
+        - tripleo_service_net_map_replace={{network.service_net_map_replace}}
+{%- endif %}
+{%- if network.ipv6 or ipv6_override %}
+        - tripleo_ipv6=true
+{%- endif %}
 
   {{network.name}}Subnet:
     type: OS::Neutron::Subnet
@@ -193,6 +199,11 @@ resources:
 {%- else %}
       enable_dhcp: {get_param: {{network.name}}NetEnableDHCP}
 {%- endif %}
+      tags:
+        - str_replace:
+            template: tripleo_vlan_id=$vlan_id
+            params:
+              $vlan_id: {get_param: {{network.name}}NetworkVlanID}
 
 
 {% for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %}
@@ -234,6 +245,11 @@ resources:
 {%- else %}
       enable_dhcp: {get_param: {{network.name}}NetEnableDHCP}
 {%- endif %}
+      tags:
+        - str_replace:
+            template: tripleo_vlan_id=$vlan_id
+            params:
+              $vlan_id: {get_param: {{network.name}}NetworkVlanID_{{subnet}}}
 
 {% endfor %}