diff --git a/environments/network-environment-v6-all.j2.yaml b/environments/network-environment-v6-all.j2.yaml
index 3b9cd30ad1..3cf09cf54c 100644
--- a/environments/network-environment-v6-all.j2.yaml
+++ b/environments/network-environment-v6-all.j2.yaml
@@ -52,13 +52,11 @@ parameter_defaults:
   # (ctlplane subnet(s) nameservers are confgured by the ``undercloud_nameservers`` option in ``undercloud.conf``)
   DnsServers: []
   # List of Neutron network types for tenant networks (will be used in order)
-  NeutronNetworkType: 'vxlan,vlan'
-  # The tunnel type for the tenant network (vxlan or gre). Set to '' to disable tunneling.
-  NeutronTunnelTypes: 'vxlan'
+  NeutronNetworkType: 'geneve,vlan'
   # Neutron VLAN ranges per network, for example 'datacentre:1:499,tenant:500:1000':
   NeutronNetworkVLANRanges: 'datacentre:1:1000'
   # Customize bonding options, e.g. "mode=4 lacp_rate=1 updelay=1000 miimon=100"
   # for Linux bonds w/LACP, or "bond_mode=active-backup" for OVS active/backup.
   BondInterfaceOvsOptions: "bond_mode=active-backup"
   # Specify Tunnel endpoints to be IPv6
-  NeutronOverlayIPVersion: 6
\ No newline at end of file
+  NeutronOverlayIPVersion: 6
diff --git a/environments/network-environment-v6.j2.yaml b/environments/network-environment-v6.j2.yaml
index 4808eee7d4..95e6e0fd36 100644
--- a/environments/network-environment-v6.j2.yaml
+++ b/environments/network-environment-v6.j2.yaml
@@ -91,9 +91,7 @@ parameter_defaults:
   # (ctlplane subnet(s) nameservers are confgured by the ``undercloud_nameservers`` option in ``undercloud.conf``)
   DnsServers: []
   # List of Neutron network types for tenant networks (will be used in order)
-  NeutronNetworkType: 'vxlan,vlan'
-  # The tunnel type for the tenant network (vxlan or gre). Set to '' to disable tunneling.
-  NeutronTunnelTypes: 'vxlan'
+  NeutronNetworkType: 'geneve,vlan'
   # Neutron VLAN ranges per network, for example 'datacentre:1:499,tenant:500:1000':
   NeutronNetworkVLANRanges: 'datacentre:1:1000'
   # Customize bonding options, e.g. "mode=4 lacp_rate=1 updelay=1000 miimon=100"
diff --git a/environments/network-environment.j2.yaml b/environments/network-environment.j2.yaml
index 6b00b8b550..60a23c25d1 100644
--- a/environments/network-environment.j2.yaml
+++ b/environments/network-environment.j2.yaml
@@ -89,9 +89,7 @@ parameter_defaults:
   # (ctlplane subnets nameservers are controlled by the ``undercloud_nameservers`` option in ``undercloud.conf``)
   DnsServers: []
   # List of Neutron network types for tenant networks (will be used in order)
-  NeutronNetworkType: 'vxlan,vlan'
-  # The tunnel type for the tenant network (vxlan or gre). Set to '' to disable tunneling.
-  NeutronTunnelTypes: 'vxlan'
+  NeutronNetworkType: 'geneve,vlan'
   # Neutron VLAN ranges per network, for example 'datacentre:1:499,tenant:500:1000':
   NeutronNetworkVLANRanges: 'datacentre:1:1000'
   # Customize bonding options, e.g. "mode=4 lacp_rate=1 updelay=1000 miimon=100"