diff --git a/ci/environments/network/multiple-nics-ipv6/network-environment.yaml b/ci/environments/network/multiple-nics-ipv6/network-environment.yaml
index 1a648880b7..7b76e4fe3a 100644
--- a/ci/environments/network/multiple-nics-ipv6/network-environment.yaml
+++ b/ci/environments/network/multiple-nics-ipv6/network-environment.yaml
@@ -1,12 +1,16 @@
-
-resource_registry:
-  OS::TripleO::BlockStorage::Net::SoftwareConfig: nic-configs/cinder-storage.yaml
-  OS::TripleO::Compute::Net::SoftwareConfig: nic-configs/compute-dvr.yaml
-  OS::TripleO::Controller::Net::SoftwareConfig: nic-configs/controller.yaml
-  OS::TripleO::ObjectStorage::Net::SoftwareConfig: nic-configs/swift-storage.yaml
-  OS::TripleO::CephStorage::Net::SoftwareConfig: nic-configs/ceph-storage.yaml
-
 parameter_defaults:
+  ControllerNetworkConfigTemplate: 'templates/ci/multiple_nics_ipv6.j2'
+  ControllerNetworkConfigWithAnsible: true
+  ComputeNetworkConfigTemplate: 'templates/ci/multiple_nics_ipv6.j2'
+  ComputeNetworkConfigWithAnsible: true
+  BlockStorageNetworkConfigTemplate: 'templates/ci/multiple_nics_ipv6.j2'
+  BlockStorageNetworkConfigWithAnsible: true
+  CellControllerNetworkConfigTemplate: 'templates/ci/multiple_nics_ipv6.j2'
+  CellControllerNetworkConfigWithAnsible: true
+  ObjectStorageNetworkConfigTemplate: 'templates/ci/multiple_nics_ipv6.j2'
+  ObjectStorageNetworkConfigWithAnsible: true
+  CephStorageNetworkConfigTemplate: 'templates/ci/multiple_nics_ipv6.j2'
+  CephStorageNetworkConfigWithAnsible: true
   ExternalNetCidr: 2001:db8:fd00:1000::/64
   ExternalAllocationPools: [{"start": "2001:db8:fd00:1000::10", "end": "2001:db8:fd00:1000:ffff:ffff:ffff:fffe"}]
   ExternalInterfaceDefaultRoute: 2001:db8:fd00:1000::1
diff --git a/ci/environments/network/public-bond/network-environment.yaml b/ci/environments/network/public-bond/network-environment.yaml
index 48b6acf487..4b916de9ed 100644
--- a/ci/environments/network/public-bond/network-environment.yaml
+++ b/ci/environments/network/public-bond/network-environment.yaml
@@ -1,12 +1,16 @@
-
-resource_registry:
-  OS::TripleO::BlockStorage::Net::SoftwareConfig: nic-configs/cinder-storage.yaml
-  OS::TripleO::Compute::Net::SoftwareConfig: nic-configs/compute.yaml
-  OS::TripleO::Controller::Net::SoftwareConfig: nic-configs/controller.yaml
-  OS::TripleO::ObjectStorage::Net::SoftwareConfig: nic-configs/swift-storage.yaml
-  OS::TripleO::CephStorage::Net::SoftwareConfig: nic-configs/ceph-storage.yaml
-
 parameter_defaults:
+  ControllerNetworkConfigTemplate: 'templates/ci/public_bond.j2'
+  ControllerNetworkConfigWithAnsible: true
+  ComputeNetworkConfigTemplate: 'templates/ci/public_bond.j2'
+  ComputeNetworkConfigWithAnsible: true
+  BlockStorageNetworkConfigTemplate: 'templates/ci/public_bond.j2'
+  BlockStorageNetworkConfigWithAnsible: true
+  CellControllerNetworkConfigTemplate: 'templates/ci/public_bond.j2'
+  CellControllerNetworkConfigWithAnsible: true
+  ObjectStorageNetworkConfigTemplate: 'templates/ci/public_bond.j2'
+  ObjectStorageNetworkConfigWithAnsible: true
+  CephStorageNetworkConfigTemplate: 'templates/ci/public_bond.j2'
+  CephStorageNetworkConfigWithAnsible: true
   ExternalNetCidr: 10.0.0.0/24
   ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}]
   ExternalInterfaceDefaultRoute: 10.0.0.1