diff --git a/example-puppet.py b/example-puppet.py
index 1ce78c62..0c3c8db7 100644
--- a/example-puppet.py
+++ b/example-puppet.py
@@ -159,7 +159,9 @@ def setup_resources():
 
     # NEUTRON
     # Deploy chain neutron -> (plugins) -> neutron_server -> ( agents )
-    neutron_puppet = vr.create('neutron_puppet', 'resources/neutron_puppet', {})[0]
+    neutron_puppet = vr.create('neutron_puppet', 'resources/neutron_puppet', {
+        'core_plugin': 'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2'
+        })[0]
     signals.connect(node1, neutron_puppet)
     signals.connect(rabbitmq_service1, neutron_puppet, {
         'ip': 'rabbit_host',
@@ -258,7 +260,8 @@ def setup_resources():
     signals.connect(neutron_puppet, neutron_puppet2, {
         'rabbit_host', 'rabbit_port',
         'rabbit_user', 'rabbit_password',
-        'rabbit_virtual_host', 'package_ensure',
+        'rabbit_virtual_host',
+        'package_ensure', 'core_plugin',
     })
 
     # NEUTRON OVS PLUGIN & AGENT WITH GRE FOR COMPUTE (node2)
diff --git a/resources/neutron_agents_ovs_puppet/actions/run.pp b/resources/neutron_agents_ovs_puppet/actions/run.pp
index 70e6b741..8ae399bd 100644
--- a/resources/neutron_agents_ovs_puppet/actions/run.pp
+++ b/resources/neutron_agents_ovs_puppet/actions/run.pp
@@ -30,4 +30,9 @@ class { 'neutron::agents::ovs':
   polling_interval    => $polling_interval,
   firewall_driver     => $firewall_driver,
   veth_mtu            => $veth_mtu,
+}
+
+# Remove external class dependency
+Service <| title == 'neutron-plugin-ovs-service' |> {
+  require    => undef
 }
\ No newline at end of file
diff --git a/resources/neutron_plugins_ovs_puppet/actions/run.pp b/resources/neutron_plugins_ovs_puppet/actions/run.pp
index 853cc227..fe3b552c 100644
--- a/resources/neutron_plugins_ovs_puppet/actions/run.pp
+++ b/resources/neutron_plugins_ovs_puppet/actions/run.pp
@@ -33,4 +33,9 @@ include neutron::params
 package { 'neutron':
   ensure => $package_ensure,
   name   => $::neutron::params::package_name,
+}
+
+# Remove external class dependency
+Service <| title == 'neutron-plugin-ovs-service' |> {
+  require    => undef
 }
\ No newline at end of file