diff --git a/manifests/deps.pp b/manifests/deps.pp
index 2e1769f99..fb719170d 100644
--- a/manifests/deps.pp
+++ b/manifests/deps.pp
@@ -82,6 +82,13 @@ class neutron::deps {
   -> Package<| tag == 'neutron-support-package'|>
   -> Anchor['neutron::install::end']
 
+  # ml2 plugin packages should be install after we start actual configuration,
+  # because the configuraiton for ml2 plugin base should be applied before
+  # ml2 plugin packages are installed
+  Anchor['neutron::install::begin']
+  -> Package<| tag == 'neutron-plugin-ml2-package'|>
+  ~> Anchor['neutron::config::end']
+
   Anchor['neutron::service::end'] -> Neutron_l3_ovs_bridge<||>
   Anchor['neutron::service::end'] -> Neutron_network<||>
   Anchor['neutron::service::end'] -> Neutron_port<||>
diff --git a/manifests/plugins/ml2/bagpipe.pp b/manifests/plugins/ml2/bagpipe.pp
index a0fcc6b71..ee4bcd133 100644
--- a/manifests/plugins/ml2/bagpipe.pp
+++ b/manifests/plugins/ml2/bagpipe.pp
@@ -52,7 +52,7 @@ class neutron::plugins::ml2::bagpipe (
     package { 'python-networking-bagpipe':
       ensure => $package_ensure,
       name   => $::neutron::params::bgpvpn_bagpipe_package,
-      tag    => 'openstack',
+      tag    => ['openstack', 'neutron-plugin-ml2-package']
     }
   }
 }
diff --git a/manifests/plugins/ml2/bigswitch.pp b/manifests/plugins/ml2/bigswitch.pp
index 3f06303c6..9e4de15cb 100644
--- a/manifests/plugins/ml2/bigswitch.pp
+++ b/manifests/plugins/ml2/bigswitch.pp
@@ -25,7 +25,7 @@ class neutron::plugins::ml2::bigswitch (
   ensure_packages('python-networking-bigswitch',
     {
       ensure => $package_ensure,
-      tag    => 'openstack',
+      tag    => ['openstack', 'neutron-plugin-ml2-package']
     }
   )
   warning('python-networking-bigswitch package management is deprecated, it will be dropped in a future release.')
diff --git a/manifests/plugins/ml2/cisco.pp b/manifests/plugins/ml2/cisco.pp
index 0f27664ac..bf0ee5357 100644
--- a/manifests/plugins/ml2/cisco.pp
+++ b/manifests/plugins/ml2/cisco.pp
@@ -27,7 +27,7 @@ class neutron::plugins::ml2::cisco (
   ensure_resource('package', 'python-networking-cisco',
     {
       ensure => $package_ensure,
-      tag    => 'openstack',
+      tag    => ['openstack', 'neutron-plugin-ml2-package']
     }
   )
   warning('python-networking-cisco package management is deprecated, it will be dropped in a future release.')
diff --git a/manifests/plugins/ml2/cisco/vts.pp b/manifests/plugins/ml2/cisco/vts.pp
index e927cbabe..7e67f0e0f 100644
--- a/manifests/plugins/ml2/cisco/vts.pp
+++ b/manifests/plugins/ml2/cisco/vts.pp
@@ -59,7 +59,7 @@ class neutron::plugins::ml2::cisco::vts (
   ensure_resource('package', 'python-cisco-controller',
     {
       ensure => $package_ensure,
-      tag    => 'openstack',
+      tag    => ['openstack', 'neutron-plugin-ml2-package']
     }
   )
 
diff --git a/manifests/plugins/ml2/fujitsu.pp b/manifests/plugins/ml2/fujitsu.pp
index aea2b4ad2..c35ac9d68 100644
--- a/manifests/plugins/ml2/fujitsu.pp
+++ b/manifests/plugins/ml2/fujitsu.pp
@@ -18,7 +18,7 @@ class neutron::plugins::ml2::fujitsu (
   ensure_resource('package', 'python-networking-fujitsu',
     {
       ensure => $package_ensure,
-      tag    => 'openstack',
+      tag    => ['openstack', 'neutron-plugin-ml2-package']
     }
   )
 }
diff --git a/manifests/plugins/ml2/mellanox.pp b/manifests/plugins/ml2/mellanox.pp
index 131345434..7d1340819 100644
--- a/manifests/plugins/ml2/mellanox.pp
+++ b/manifests/plugins/ml2/mellanox.pp
@@ -27,7 +27,7 @@ class neutron::plugins::ml2::mellanox (
   ensure_resource('package', 'python-networking-mlnx',
     {
       ensure => $package_ensure,
-      tag    => 'openstack'
+      tag    => ['openstack', 'neutron-plugin-ml2-package']
     }
   )
 }
diff --git a/manifests/plugins/ml2/networking_ansible.pp b/manifests/plugins/ml2/networking_ansible.pp
index 81515c483..9486ab506 100644
--- a/manifests/plugins/ml2/networking_ansible.pp
+++ b/manifests/plugins/ml2/networking_ansible.pp
@@ -38,6 +38,7 @@ class neutron::plugins::ml2::networking_ansible(
   ) {
   include neutron::deps
   include neutron::params
+  require ::neutron::plugins::ml2
 
   if($::osfamily != 'RedHat') {
     # Drivers are only packaged for RedHat at this time
@@ -47,7 +48,7 @@ class neutron::plugins::ml2::networking_ansible(
   ensure_resource('package', 'python2-networking-ansible',
     {
       ensure => $package_ensure,
-      tag    => ['openstack', 'neutron-package']
+      tag    => ['openstack', 'neutron-plugin-ml2-package']
     }
   )
   create_resources(neutron::plugins::ml2::networking_ansible_host, $host_configs)
diff --git a/manifests/plugins/ml2/networking_baremetal.pp b/manifests/plugins/ml2/networking_baremetal.pp
index b4f7804fa..435648b92 100644
--- a/manifests/plugins/ml2/networking_baremetal.pp
+++ b/manifests/plugins/ml2/networking_baremetal.pp
@@ -24,7 +24,7 @@ class neutron::plugins::ml2::networking_baremetal(
     package { 'python2-networking-baremetal':
       ensure => $package_ensure,
       name   => $::neutron::params::networking_baremetal_package,
-      tag    => ['openstack', 'neutron-package'],
+      tag    => ['openstack', 'neutron-plugin-ml2-package'],
     }
   }
 }
diff --git a/manifests/plugins/ml2/opendaylight.pp b/manifests/plugins/ml2/opendaylight.pp
index e08847a58..d6d0c6b41 100644
--- a/manifests/plugins/ml2/opendaylight.pp
+++ b/manifests/plugins/ml2/opendaylight.pp
@@ -60,7 +60,7 @@ class neutron::plugins::ml2::opendaylight (
   ensure_resource('package', 'python-networking-odl',
     {
       ensure => $package_ensure,
-      tag    => 'openstack',
+      tag    => ['openstack', 'neutron-plugin-ml2-package']
     }
   )
 
diff --git a/manifests/plugins/ml2/ovn.pp b/manifests/plugins/ml2/ovn.pp
index 9fcec9bf1..23bd426a6 100644
--- a/manifests/plugins/ml2/ovn.pp
+++ b/manifests/plugins/ml2/ovn.pp
@@ -141,7 +141,7 @@ class neutron::plugins::ml2::ovn(
   ensure_resource('package', $::neutron::params::ovn_plugin_package,
     {
       ensure => $package_ensure,
-      tag    => 'openstack',
+      tag    => ['openstack', 'neutron-plugin-ml2-package']
     }
   )
 
diff --git a/spec/classes/neutron_plugins_ml2_bagpipe_spec.rb b/spec/classes/neutron_plugins_ml2_bagpipe_spec.rb
index 7293ada5e..2798400e2 100644
--- a/spec/classes/neutron_plugins_ml2_bagpipe_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_bagpipe_spec.rb
@@ -22,7 +22,7 @@ describe 'neutron::plugins::ml2::bagpipe' do
       should contain_package('python-networking-bagpipe').with(
         :name   => platform_params[:bagpipe_package_name],
         :ensure => params[:package_ensure],
-        :tag    => 'openstack'
+        :tag    => ['openstack', 'neutron-plugin-ml2-package']
         )
     end
 
diff --git a/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb b/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb
index c6397a56e..0608d610c 100644
--- a/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb
@@ -31,7 +31,7 @@ describe 'neutron::plugins::ml2::bigswitch' do
     it 'should have' do
       should contain_package('python-networking-bigswitch').with(
         :ensure => params[:package_ensure],
-        :tag    => 'openstack'
+        :tag    => ['openstack', 'neutron-plugin-ml2-package']
         )
     end
   end
diff --git a/spec/classes/neutron_plugins_ml2_cisco_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_spec.rb
index e78c6ddae..6ee6b5aa0 100644
--- a/spec/classes/neutron_plugins_ml2_cisco_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_cisco_spec.rb
@@ -31,7 +31,7 @@ describe 'neutron::plugins::ml2::cisco' do
     it 'should have' do
       should contain_package('python-networking-cisco').with(
         :ensure => params[:package_ensure],
-        :tag    => 'openstack'
+        :tag    => ['openstack', 'neutron-plugin-ml2-package']
         )
     end
   end
diff --git a/spec/classes/neutron_plugins_ml2_cisco_vts_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_vts_spec.rb
index 6fccf8362..6bb323f75 100644
--- a/spec/classes/neutron_plugins_ml2_cisco_vts_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_cisco_vts_spec.rb
@@ -37,7 +37,7 @@ describe 'neutron::plugins::ml2::cisco::vts' do
     it 'should have' do
       should contain_package('python-cisco-controller').with(
           :ensure => params[:package_ensure],
-          :tag    => 'openstack'
+          :tag    => ['openstack', 'neutron-plugin-ml2-package']
       )
     end
 
diff --git a/spec/classes/neutron_plugins_ml2_fujitsu_spec.rb b/spec/classes/neutron_plugins_ml2_fujitsu_spec.rb
index cd0421aa4..915742a69 100644
--- a/spec/classes/neutron_plugins_ml2_fujitsu_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_fujitsu_spec.rb
@@ -30,7 +30,7 @@ describe 'neutron::plugins::ml2::fujitsu' do
     it 'should have' do
       should contain_package('python-networking-fujitsu').with(
         :ensure => params[:package_ensure],
-        :tag    => 'openstack'
+        :tag    => ['openstack', 'neutron-plugin-ml2-package']
         )
     end
   end
diff --git a/spec/classes/neutron_plugins_ml2_mellanox_spec.rb b/spec/classes/neutron_plugins_ml2_mellanox_spec.rb
index e1db0ca0e..e1f45a1a8 100644
--- a/spec/classes/neutron_plugins_ml2_mellanox_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_mellanox_spec.rb
@@ -31,7 +31,7 @@ describe 'neutron::plugins::ml2::mellanox' do
     it 'should have' do
       should contain_package('python-networking-mlnx').with(
         :ensure => params[:package_ensure],
-        :tag    => 'openstack'
+        :tag    => ['openstack', 'neutron-plugin-ml2-package']
         )
     end
   end
diff --git a/spec/classes/neutron_plugins_ml2_networking_ansible_spec.rb b/spec/classes/neutron_plugins_ml2_networking_ansible_spec.rb
index 9fe32b703..70924cd13 100644
--- a/spec/classes/neutron_plugins_ml2_networking_ansible_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_networking_ansible_spec.rb
@@ -34,10 +34,10 @@ describe 'neutron::plugins::ml2::networking_ansible' do
       should contain_package('python2-networking-ansible').with(
         :name   => platform_params[:networking_ansible_package],
         :ensure => p[:package_ensure],
-        :tag    => ['openstack', 'neutron-package'],
+        :tag    => ['openstack', 'neutron-plugin-ml2-package'],
       )
       should contain_package('python2-networking-ansible').that_requires('Anchor[neutron::install::begin]')
-      should contain_package('python2-networking-ansible').that_notifies('Anchor[neutron::install::end]')
+      should contain_package('python2-networking-ansible').that_notifies('Anchor[neutron::config::end]')
     end
 
     it 'should configure non-host config' do
diff --git a/spec/classes/neutron_plugins_ml2_networking_baremetal_spec.rb b/spec/classes/neutron_plugins_ml2_networking_baremetal_spec.rb
index c9a6b908e..91a0c967e 100644
--- a/spec/classes/neutron_plugins_ml2_networking_baremetal_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_networking_baremetal_spec.rb
@@ -22,10 +22,10 @@ describe 'neutron::plugins::ml2::networking_baremetal' do
       should contain_package('python2-networking-baremetal').with(
         :name   => platform_params[:networking_baremetal_package],
         :ensure => p[:package_ensure],
-        :tag    => ['openstack', 'neutron-package'],
+        :tag    => ['openstack', 'neutron-plugin-ml2-package'],
       )
       should contain_package('python2-networking-baremetal').that_requires('Anchor[neutron::install::begin]')
-      should contain_package('python2-networking-baremetal').that_notifies('Anchor[neutron::install::end]')
+      should contain_package('python2-networking-baremetal').that_notifies('Anchor[neutron::config::end]')
     end
   end
 
diff --git a/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb b/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb
index 10862119c..1e22f4d63 100644
--- a/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb
@@ -37,7 +37,7 @@ describe 'neutron::plugins::ml2::opendaylight' do
     it 'should have' do
       should contain_package('python-networking-odl').with(
         :ensure => params[:package_ensure],
-        :tag    => 'openstack'
+        :tag    => ['openstack', 'neutron-plugin-ml2-package']
         )
     end