diff --git a/labs/scripts/ubuntu/setup_neutron_compute.sh b/labs/scripts/ubuntu/setup_neutron_compute.sh
index 8468ddae..403d4339 100755
--- a/labs/scripts/ubuntu/setup_neutron_compute.sh
+++ b/labs/scripts/ubuntu/setup_neutron_compute.sh
@@ -25,7 +25,7 @@ SYSCTL
 sudo sysctl -p
 
 echo "Installing networking components for compute node."
-sudo apt-get install -y neutron-common neutron-plugin-ml2 \
+sudo apt-get install -y neutron-plugin-ml2 \
     neutron-plugin-openvswitch-agent
 
 echo "Configuring neutron for compute node."
@@ -37,7 +37,7 @@ conf=/etc/neutron/neutron.conf
 echo "Configuring $conf."
 
 # Configure AMQP parameters
-iniset_sudo $conf DEFAULT rpc_backend neutron.openstack.common.rpc.impl_kombu
+iniset_sudo $conf DEFAULT rpc_backend rabbit
 iniset_sudo $conf DEFAULT rabbit_host controller-mgmt
 iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD"
 
@@ -45,10 +45,8 @@ iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD"
 iniset_sudo $conf DEFAULT auth_strategy keystone
 
 # Configuring [keystone_authtoken] section
-iniset_sudo $conf keystone_authtoken auth_uri "http://controller-mgmt:5000"
-iniset_sudo $conf keystone_authtoken auth_host controller-mgmt
-iniset_sudo $conf keystone_authtoken auth_protocol http
-iniset_sudo $conf keystone_authtoken auth_port 35357
+iniset_sudo $conf keystone_authtoken auth_uri "http://controller-mgmt:5000/v2.0"
+iniset_sudo $conf keystone_authtoken identity_uri http://controller-mgmt:35357
 iniset_sudo $conf keystone_authtoken admin_tenant_name "$SERVICE_TENANT_NAME"
 iniset_sudo $conf keystone_authtoken admin_user "$neutron_admin_user"
 iniset_sudo $conf keystone_authtoken admin_password "$neutron_admin_password"
@@ -64,7 +62,7 @@ echo "Configuring the OVS plug-in to use GRE tunneling."
 conf=/etc/neutron/plugins/ml2/ml2_conf.ini
 
 # Under the ml2 section
-iniset_sudo $conf ml2 type_drivers gre
+iniset_sudo $conf ml2 type_drivers flat,gre
 iniset_sudo $conf ml2 tenant_network_types gre
 iniset_sudo $conf ml2 mechanism_drivers openvswitch
 
@@ -73,20 +71,18 @@ iniset_sudo $conf ml2_type_gre tunnel_id_ranges 1:1000
 
 # Under the securitygroup section
 iniset_sudo $conf securitygroup enable_security_group True
+iniset_sudo $conf securitygroup enable_ipset True
 iniset_sudo $conf securitygroup firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
 
 # Under the ovs section
 iniset_sudo $conf ovs local_ip "$(hostname_to_ip compute-data)"
 iniset_sudo $conf ovs enable_tunneling True
 
-iniset_sudo $conf ovs tunnel_type gre
+iniset_sudo $conf agent tunnel_types gre
 
 echo "Restarting the Open vSwitch (OVS) service."
 sudo service openvswitch-switch restart
 
-echo "Adding the integration bridge."
-sudo ovs-vsctl --may-exist add-br br-int
-
 echo "Configuring Compute to use Networking."
 conf=/etc/nova/nova.conf
 iniset_sudo $conf DEFAULT network_api_class nova.network.neutronv2.api.API
@@ -94,12 +90,13 @@ iniset_sudo $conf DEFAULT security_group_api neutron
 iniset_sudo $conf DEFAULT linuxnet_interface_driver neutron.agent.linux.interface.OVSInterfaceDriver
 iniset_sudo $conf DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
 
-iniset_sudo $conf DEFAULT neutron_url http://controller-mgmt:9696
-iniset_sudo $conf DEFAULT neutron_auth_strategy keystone
-iniset_sudo $conf DEFAULT neutron_admin_auth_url http://controller-mgmt:35357/v2.0
-iniset_sudo $conf DEFAULT neutron_admin_tenant_name "$SERVICE_TENANT_NAME"
-iniset_sudo $conf DEFAULT neutron_admin_username "$neutron_admin_user"
-iniset_sudo $conf DEFAULT neutron_admin_password "$neutron_admin_password"
+
+iniset_sudo $conf neutron url http://controller-mgmt:9696
+iniset_sudo $conf neutron auth_strategy keystone
+iniset_sudo $conf neutron admin_auth_url http://controller-mgmt:35357/v2.0
+iniset_sudo $conf neutron admin_tenant_name "$SERVICE_TENANT_NAME"
+iniset_sudo $conf neutron admin_username "$neutron_admin_user"
+iniset_sudo $conf neutron admin_password "$neutron_admin_password"
 
 echo "Restarting the Compute service."
 sudo service nova-compute restart