diff --git a/deployment_scripts/puppet/manifests/disable_openvswitch.pp b/deployment_scripts/puppet/manifests/disable_openvswitch.pp
new file mode 100644
index 0000000..6f129ca
--- /dev/null
+++ b/deployment_scripts/puppet/manifests/disable_openvswitch.pp
@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2016, PLUMgrid Inc, http://plumgrid.com
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+notice('MODULAR: plumgrid/disable_ovs.pp')
+
+file { '/etc/hiera/plugins/plumgrid.yaml':
+  ensure  => file,
+  content => 'use_ovs: false',
+}
+
+file_line { 'Replace provider ovs with lnx':
+  path     => '/etc/astute.yaml',
+  line     => '    provider: lnx',
+  match    => 'ovs',
+  multiple => true,
+}
+
+file_line { 'Replace provider ovs with lnx in globals.yaml':
+  path     => '/etc/hiera/globals.yaml',
+  line     => '        provider: lnx',
+  match    => '        provider: ovs',
+  multiple => true,
+}
diff --git a/deployment_scripts/puppet/manifests/pg_common.pp b/deployment_scripts/puppet/manifests/pg_common.pp
index 1f508e1..16e7e14 100644
--- a/deployment_scripts/puppet/manifests/pg_common.pp
+++ b/deployment_scripts/puppet/manifests/pg_common.pp
@@ -67,22 +67,6 @@ file { '/tmp/plumgrid_config':
   content => "fuel_hostname=$fuel_hostname\nplumgrid_username=$plumgrid_username\nplumgrid_password=$plumgrid_password\nhaproxy_vip=$haproxy_vip\ndirector_ip=$controller_ipaddresses\nedge_ip=$compute_ipaddresses\ngateway_ip=$gateway_ipaddresses\nmetadata_secret=$metadata\nvip=$plumgrid_vip\nopsvm_ip=$opsvm_ip\npg_repo=$plumgrid_pkg_repo\nzone_name=$plumgrid_zone\nfabric_network=$fabric_network\nfuel_version=$fuel_version\nlicense=$plumgrid_lic",
 }
 
-exec { 'ovs_rmmod':
-  command => 'rmmod openvswitch',
-  path    => '/sbin',
-  onlyif  => 'lsmod | /bin/grep openvswitch'
-}
-
-exec { 'openvswitch-switch_forceremove':
-  command => 'dpkg -r --force-all openvswitch-switch',
-  path    => '/usr/bin',
-  onlyif  => 'dpkg -l | /bin/grep openvswitch-switch'
-}
-
-package { 'openvswitch-*':
-  ensure => absent
-}
-
 file { ['/var/lib/plumgrid', '/var/lib/plumgrid/zones', "/var/lib/plumgrid/zones/$plumgrid_zone"]:
   ensure  =>  directory,
   mode    =>  0755,
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index b52a09f..d66dc2d 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -8,6 +8,44 @@
     strategy:
       type: parallel
 
+# Skip default neutron plugins
+- id: primary-openstack-network-plugins-l2
+  type: skipped
+- id: openstack-network-plugins-l2
+  type: skipped
+- id: openstack-network-routers-ha
+  type: skipped
+# Skip Neutron agents
+- id: primary-openstack-network-agents-l3
+  type: skipped
+- id: openstack-network-agents-l3
+  type: skipped
+- id: primary-openstack-network-agents-dhcp
+  type: skipped
+- id: openstack-network-agents-dhcp
+  type: skipped
+- id: primary-openstack-network-agents-metadata
+  type: skipped
+- id: openstack-network-agents-metadata
+  type: skipped
+- id: openstack-network-agents-sriov
+  type: skipped
+# Skip default fuel networks and routers
+- id: openstack-network-networks
+  type: skipped
+- id: openstack-network-routers
+  type: skipped
+
+- id: disable-openvswitch
+  role: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
+  required_for: [netconfig]
+  requires: [deploy_start, globals]
+  type: puppet
+  parameters:
+    puppet_manifest: puppet/manifests/disable_openvswitch.pp
+    puppet_modules: puppet/modules:/etc/puppet/modules
+    timeout: 120
+
 - id: pgtools-support
   role: ['controller', 'primary-controller']
   required_for: [post_deployment_end]
@@ -88,19 +126,10 @@
 
 - id: setup-gateway
   role: ['PLUMgrid-Gateway']
-  required_for: [post_deployment_end, cleanup_os]
+  required_for: [post_deployment_end]
   requires: [post_deployment_start, setup-edge]
   type: puppet
   parameters:
     puppet_manifest: puppet/manifests/gateway.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 3000
-
-- id: cleanup_os
-  role: ['primary-controller']
-  required_for: [post_deployment_end]
-  requires: [post_deployment_start, setup-gateway]
-  type: shell
-  parameters:
-    cmd: bash cleanup_os.sh
-    timeout: 3000