diff --git a/environments/net-bond-with-vlans-no-external.j2.yaml b/environments/net-bond-with-vlans-no-external.j2.yaml
index b4f7e71c4c..90eddf4d06 100644
--- a/environments/net-bond-with-vlans-no-external.j2.yaml
+++ b/environments/net-bond-with-vlans-no-external.j2.yaml
@@ -16,7 +16,7 @@ resource_registry:
 
 {%- for role in roles if role.name != "Controller" %}
   # Port assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/bond-with-vlans/{{role.deprecated_nic_config_name|default(role.name.lower().yaml)}}
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/bond-with-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
 {%- endfor %}
 
   # FIXME this should really be handled via enabled networks in roles_data not overriding here.
diff --git a/environments/net-bond-with-vlans-v6.j2.yaml b/environments/net-bond-with-vlans-v6.j2.yaml
index 51a9743697..6941c54e21 100644
--- a/environments/net-bond-with-vlans-v6.j2.yaml
+++ b/environments/net-bond-with-vlans-v6.j2.yaml
@@ -9,7 +9,7 @@
 resource_registry:
 {%- for role in roles if role != "Controller" %}
   # Port assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/bond-with-vlans/{{role.deprecated_nic_config_name|default(role.name.lower().yaml)}}
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/bond-with-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
 {%- endfor %}
 
   # FIXME this should really be handled via setting ipv6:true in network_data not overriding here.
diff --git a/environments/net-bond-with-vlans.j2.yaml b/environments/net-bond-with-vlans.j2.yaml
index b856e8d0ca..7524b0d574 100644
--- a/environments/net-bond-with-vlans.j2.yaml
+++ b/environments/net-bond-with-vlans.j2.yaml
@@ -8,5 +8,5 @@
 resource_registry:
 {%- for role in roles %}
   # Port assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/bond-with-vlans/{{role.deprecated_nic_config_name|default(role.name.lower().yaml)}}
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/bond-with-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
 {%- endfor %}
diff --git a/environments/net-dpdkbond-with-vlans.j2.yaml b/environments/net-dpdkbond-with-vlans.j2.yaml
index ec1d05bd67..c1967a54d6 100644
--- a/environments/net-dpdkbond-with-vlans.j2.yaml
+++ b/environments/net-dpdkbond-with-vlans.j2.yaml
@@ -12,7 +12,7 @@
 resource_registry:
 {%- for role in roles if role.name != "Compute" %}
   # Port assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/bond-with-vlans/{{role.deprecated_nic_config_name|default(role.name.lower().yaml)}}
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/bond-with-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
 {%- endfor %}
 
   # FIXME this won't handle any custom compute roles, instead we should have a generic way to override this
diff --git a/environments/net-multiple-nics-v6.j2.yaml b/environments/net-multiple-nics-v6.j2.yaml
index a1fa448774..54f50f2f02 100644
--- a/environments/net-multiple-nics-v6.j2.yaml
+++ b/environments/net-multiple-nics-v6.j2.yaml
@@ -8,7 +8,7 @@
 resource_registry:
 {%- for role in roles if role.name != "Controller" %}
   # Port assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/multiple-nics/{{role.deprecated_nic_config_name|default(role.name.lower().yaml)}}
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/multiple-nics/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
 {%- endfor %}
 
   # FIXME this should really be handled via setting ipv6:true in network_data not overriding here.
diff --git a/environments/net-multiple-nics.j2.yaml b/environments/net-multiple-nics.j2.yaml
index a3a85f217a..c2315e3d76 100644
--- a/environments/net-multiple-nics.j2.yaml
+++ b/environments/net-multiple-nics.j2.yaml
@@ -8,5 +8,5 @@
 resource_registry:
 {%- for role in roles %}
   # Port assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/multiple-nics/{{role.deprecated_nic_config_name|default(role.name.lower().yaml)}}
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/multiple-nics/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
 {%- endfor %}
diff --git a/environments/net-single-nic-linux-bridge-with-vlans.j2.yaml b/environments/net-single-nic-linux-bridge-with-vlans.j2.yaml
index b790d6ab06..ed5d85ccc4 100644
--- a/environments/net-single-nic-linux-bridge-with-vlans.j2.yaml
+++ b/environments/net-single-nic-linux-bridge-with-vlans.j2.yaml
@@ -8,5 +8,5 @@
 resource_registry:
 {%- for role in roles %}
   # Port assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/single-nic-linux-bridge-vlans/{{role.deprecated_nic_config_name|default(role.name.lower().yaml)}}
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/single-nic-linux-bridge-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
 {%- endfor %}
diff --git a/environments/net-single-nic-with-vlans-no-external.j2.yaml b/environments/net-single-nic-with-vlans-no-external.j2.yaml
index c8d239e56b..558fef5d0c 100644
--- a/environments/net-single-nic-with-vlans-no-external.j2.yaml
+++ b/environments/net-single-nic-with-vlans-no-external.j2.yaml
@@ -16,7 +16,7 @@ resource_registry:
   # Configure other ports as normal
 {%- for role in roles if role.name != "Controller" %}
   # 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: ../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
 {%- endfor %}
 
   # FIXME this should really be handled via enabled networks in roles_data not overriding here.
diff --git a/environments/net-single-nic-with-vlans-v6.j2.yaml b/environments/net-single-nic-with-vlans-v6.j2.yaml
index f9d1d4a1a6..3e6c42f9d8 100644
--- a/environments/net-single-nic-with-vlans-v6.j2.yaml
+++ b/environments/net-single-nic-with-vlans-v6.j2.yaml
@@ -8,7 +8,7 @@
 resource_registry:
 {%- for role in roles if role.name != "Controller" %}
   # 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: ../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
 {%- endfor %}
 
   # FIXME this should really be handled via setting ipv6:true in network_data not overriding here.
diff --git a/environments/net-single-nic-with-vlans.j2.yaml b/environments/net-single-nic-with-vlans.j2.yaml
index 61d77d225e..c52e55934d 100644
--- a/environments/net-single-nic-with-vlans.j2.yaml
+++ b/environments/net-single-nic-with-vlans.j2.yaml
@@ -8,5 +8,5 @@
 resource_registry:
 {%- 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: ../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
 {%- endfor %}
diff --git a/environments/network-environment-v6.j2.yaml b/environments/network-environment-v6.j2.yaml
index 6fbc66084c..df9bf604fc 100644
--- a/environments/network-environment-v6.j2.yaml
+++ b/environments/network-environment-v6.j2.yaml
@@ -11,7 +11,7 @@ resource_registry:
 {%- 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)}}
+    ../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
 {%- endfor %}
 
 parameter_defaults:
diff --git a/environments/network-environment.j2.yaml b/environments/network-environment.j2.yaml
index 15616f5380..0a851ecaa5 100644
--- a/environments/network-environment.j2.yaml
+++ b/environments/network-environment.j2.yaml
@@ -7,7 +7,7 @@ resource_registry:
 {%- 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)}}
+    ../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
 {%- endfor %}
 
 parameter_defaults: