diff --git a/README.rst b/README.rst
index 60eb58a..4a5787a 100644
--- a/README.rst
+++ b/README.rst
@@ -157,7 +157,6 @@
     neutron:
       server:
         version: mitaka
-        plugin: ml2
         bind:
           address: 172.20.0.1
           port: 9696
@@ -267,7 +266,6 @@
     neutron:
       server:
         version: mitaka
-        plugin: ml2
         bind:
           address: 172.20.0.1
           port: 9696
@@ -374,7 +372,6 @@
     neutron:
       server:
         version: mitaka
-        plugin: ml2
         bind:
           address: 172.20.0.1
           port: 9696
@@ -561,7 +558,6 @@
     neutron:
       server:
         version: mitaka
-        plugin: ml2
         ...
         global_physnet_mtu: 9000
         l3_ha: False
@@ -583,7 +579,6 @@
     neutron:
       compute:
         version: mitaka
-        plugin: ml2
         ...
         dvr: True
         agent_mode: dvr
@@ -613,7 +608,6 @@
     neutron:
       compute:
         version: mitaka
-        plugin: ml2
         dpdk: True
         backend:
           engine: ml2
@@ -629,7 +623,6 @@
     neutron:
       server:
         version: mitaka
-        plugin: ml2
         backend:
           engine: ml2
           ...
@@ -642,7 +635,6 @@
     neutron:
       compute:
         version: mitaka
-        plugin: ml2
         ...
         backend:
           engine: ml2
@@ -678,7 +670,6 @@
 
     neutron:
       server:
-        plugin: contrail
         backend:
           engine: contrail
           host: contrail_discovery_host
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index 12a603c..a47f680 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -8,7 +8,6 @@
   neutron:
     server:
       enabled: true
-      plugin: ml2
       fwaas: false
       dns_domain: novalocal
       tunnel_type: vxlan
diff --git a/neutron/files/juno/neutron-server b/neutron/files/juno/neutron-server
index 9b06503..3c91959 100644
--- a/neutron/files/juno/neutron-server
+++ b/neutron/files/juno/neutron-server
@@ -7,10 +7,10 @@
 # neutron.conf
 #NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini"
 
-{%- if server.plugin == "ml2" %}
+{%- if server.backend.engine == "ml2" %}
 NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugins/ml2/ml2_conf.ini"
 {%- endif %}
 
-{%- if server.plugin == "contrail" %}
+{%- if server.backend.engine == "contrail" %}
 NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugins/opencontrail/ContrailPlugin.ini"
-{%- endif %}
\ No newline at end of file
+{%- endif %}
diff --git a/neutron/map.jinja b/neutron/map.jinja
index 80aa94d..eef262f 100644
--- a/neutron/map.jinja
+++ b/neutron/map.jinja
@@ -92,22 +92,3 @@
         'error_log_rate': 0.2,
     },
 }, grain='os_family', merge=salt['pillar.get']('neutron:monitoring')) %}
-
-{%- if pillar.neutron.server is defined %}
-
-{%- set tmp_server = pillar.neutron.server %}
-
-{%- if not tmp_server.backend is defined %}
-
-{%- if pillar.opencontrail is defined and tmp_server.plugin == "contrail" %}
-
-{%- from "opencontrail/map.jinja" import config with context %}
-
-{%- set backend = {'engine': tmp_server.plugin, 'host': config.discovery.host, 'token': config.identity.token, 'user': config.identity.user, 'password': config.identity.password, 'tenant': config.identity.tenant} %}
-{%- set tmp = server.update({'backend': backend}) %}
-
-{%- endif %}
-
-{%- endif %}
-
-{%- endif %}
diff --git a/tests/pillar/control_dvr.sls b/tests/pillar/control_dvr.sls
index a6fc8b3..5031810 100644
--- a/tests/pillar/control_dvr.sls
+++ b/tests/pillar/control_dvr.sls
@@ -44,7 +44,6 @@
       port: 5672
       user: openstack
       virtual_host: /openstack
-    plugin: ml2
     version: mitaka
     policy:
       create_subnet: 'rule:admin_or_network_owner'
diff --git a/tests/pillar/control_fwaas_v1.sls b/tests/pillar/control_fwaas_v1.sls
index 5311d2f..c39f05c 100644
--- a/tests/pillar/control_fwaas_v1.sls
+++ b/tests/pillar/control_fwaas_v1.sls
@@ -45,7 +45,6 @@
       port: 5672
       user: openstack
       virtual_host: /openstack
-    plugin: ml2
     policy:
       create_subnet: 'rule:admin_or_network_owner'
       'get_network:queue_id': 'rule:admin_only'
diff --git a/tests/pillar/control_lbaas_octavia.sls b/tests/pillar/control_lbaas_octavia.sls
index 5209b2d..65b0318 100644
--- a/tests/pillar/control_lbaas_octavia.sls
+++ b/tests/pillar/control_lbaas_octavia.sls
@@ -52,7 +52,6 @@
       port: 5672
       user: openstack
       virtual_host: /openstack
-    plugin: ml2
     policy:
       create_subnet: 'rule:admin_or_network_owner'
       'get_network:queue_id': 'rule:admin_only'
diff --git a/tests/pillar/control_nodvr.sls b/tests/pillar/control_nodvr.sls
index 0d18f6a..9597eee 100644
--- a/tests/pillar/control_nodvr.sls
+++ b/tests/pillar/control_nodvr.sls
@@ -44,7 +44,6 @@
       port: 5672
       user: openstack
       virtual_host: /openstack
-    plugin: ml2
     version: mitaka
     policy:
       create_subnet: 'rule:admin_or_network_owner'
diff --git a/tests/pillar/control_qos.sls b/tests/pillar/control_qos.sls
index 3c24ccf..9bed6b5 100644
--- a/tests/pillar/control_qos.sls
+++ b/tests/pillar/control_qos.sls
@@ -45,7 +45,6 @@
       port: 5672
       user: openstack
       virtual_host: /openstack
-    plugin: ml2
     version: ocata
     policy:
       create_subnet: 'rule:admin_or_network_owner'