diff --git a/environments/neutron-ml2-ansible.yaml b/environments/neutron-ml2-ansible.yaml
index 5d3f45d553..a16653b676 100644
--- a/environments/neutron-ml2-ansible.yaml
+++ b/environments/neutron-ml2-ansible.yaml
@@ -4,6 +4,6 @@ resource_registry:
 
 parameter_defaults:
   IronicDefaultNetworkInterface: neutron
-  NeutronMechanismDrivers: openvswitch,ansible
-  NeutronTypeDrivers: local,vxlan,vlan,flat
+  NeutronMechanismDrivers: ovn,ansible
+  NeutronTypeDrivers: local,geneve,vlan,flat
   NeutronNetworkType: vlan
diff --git a/environments/services/neutron-ml2-ansible.yaml b/environments/services/neutron-ml2-ansible.yaml
index e40f047893..bb832649ae 100644
--- a/environments/services/neutron-ml2-ansible.yaml
+++ b/environments/services/neutron-ml2-ansible.yaml
@@ -1,8 +1,9 @@
 # A Heat environment file which can be used to enable network-ansible ML2 mechanism driver
 resource_registry:
   OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Ansible
+
 parameter_defaults:
   IronicDefaultNetworkInterface: neutron
-  NeutronMechanismDrivers: openvswitch,ansible
-  NeutronTypeDrivers: local,vxlan,vlan,flat
+  NeutronMechanismDrivers: ovn,ansible
+  NeutronTypeDrivers: local,geneve,vlan,flat
   NeutronNetworkType: vlan