diff --git a/environments/network-environment-v6-all.j2.yaml b/environments/network-environment-v6-all.j2.yaml
index 6e6df2a67e..c6c5ec1037 100644
--- a/environments/network-environment-v6-all.j2.yaml
+++ b/environments/network-environment-v6-all.j2.yaml
@@ -7,14 +7,20 @@ resource_registry:
   # such as net-bond-with-vlans-v6.yaml, or modifying the list here.
 {%- for role in roles %}
   # Port assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig:
-    ../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
 {%- endfor %}
 
 parameter_defaults:
   # This section is where deployment-specific configuration is done
   #
-  #
+{%- for role in roles %}
+{%- if 'storage' in role.tags %}
+  {{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans_storage.j2'
+{%- else %}
+  {{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans.j2'
+{%- endif %}
+{%- endfor %}
+
 {% for network in networks if network.enabled|default(true) %}
   # Customize the IP subnets to match the local environment
   {{network.name}}NetCidr: '{{network.ipv6_subnet}}'
diff --git a/environments/network-environment-v6.j2.yaml b/environments/network-environment-v6.j2.yaml
index cddec129c5..21eafcd1d3 100644
--- a/environments/network-environment-v6.j2.yaml
+++ b/environments/network-environment-v6.j2.yaml
@@ -10,13 +10,20 @@ resource_registry:
   # such as net-bond-with-vlans-v6.yaml, or modifying the list here.
 {%- for role in roles %}
   # Port assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig:
-    ../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
 {%- endfor %}
 
 parameter_defaults:
   # This section is where deployment-specific configuration is done
   #
+{%- for role in roles %}
+{%- if 'storage' in role.tags %}
+  {{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans_storage.j2'
+{%- else %}
+  {{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans.j2'
+{%- endif %}
+{%- endfor %}
+
 {% for network in networks if network.enabled|default(true) %}
 {%-     if network.name != 'Tenant' %}
   # Customize the IP subnets to match the local environment
diff --git a/environments/network-environment.j2.yaml b/environments/network-environment.j2.yaml
index 8bbe577ee0..7ebbf0ada8 100644
--- a/environments/network-environment.j2.yaml
+++ b/environments/network-environment.j2.yaml
@@ -6,13 +6,20 @@ resource_registry:
   # such as net-bond-with-vlans.yaml, or modifying the list here.
 {%- for role in roles %}
   # Port assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig:
-    ../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
 {%- endfor %}
 
 parameter_defaults:
   # This section is where deployment-specific configuration is done
   #
+{%- for role in roles %}
+{%- if 'storage' in role.tags %}
+  {{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans_storage.j2'
+{%- else %}
+  {{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans.j2'
+{%- endif %}
+{%- endfor %}
+
 {% for network in networks if network.enabled|default(true) %}
   # Customize the IP subnet to match the local environment
 {%-     if network.ipv6|default(false) %}