diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 5901a9cfe9..40c44aefc0 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -17,6 +17,11 @@ neutron::plugins::ml2::tunnel_id_ranges:
   - '1:1000'
 neutron::plugins::ml2::vni_ranges:
   - '1:1000'
+neutron::plugins::ml2::type_drivers:
+  - flat
+  - gre
+  - vxlan
+  - vlan
 
 sysctl_settings:
   net.ipv4.tcp_keepalive_intvl:
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index caca89a840..00bab7f653 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -68,7 +68,6 @@ include ::neutron
 class { 'neutron::plugins::ml2':
   flat_networks        => split(hiera('neutron_flat_networks'), ','),
   tenant_network_types => [hiera('neutron_tenant_network_type')],
-  type_drivers         => [hiera('neutron_tenant_network_type')],
 }
 
 class { 'neutron::agents::ml2::ovs':
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 7070e05c07..52df94fc32 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -277,7 +277,6 @@ if hiera('step') >= 3 {
   class { 'neutron::plugins::ml2':
     flat_networks => split(hiera('neutron_flat_networks'), ','),
     tenant_network_types => [hiera('neutron_tenant_network_type')],
-    type_drivers => [hiera('neutron_tenant_network_type')],
   }
   class { 'neutron::agents::ml2::ovs':
     bridge_mappings => split(hiera('neutron_bridge_mappings'), ','),
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index ac05c3673c..695724b830 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -509,7 +509,6 @@ if hiera('step') >= 3 {
   class { 'neutron::plugins::ml2':
     flat_networks   => split(hiera('neutron_flat_networks'), ','),
     tenant_network_types => [hiera('neutron_tenant_network_type')],
-    type_drivers    => [hiera('neutron_tenant_network_type')],
   }
   class { 'neutron::agents::ml2::ovs':
     # manage_service   => false # not implemented