diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index 9c8e069a7..b0090e0ff 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -4,9 +4,16 @@ register_project_for_upgrade networking-odl
 # networking-odl before neutron
 UPGRADE_PROJECTS="networking-odl ${UPGRADE_PROJECTS/ networking-odl/}"
 
+# Add karaf features to be enabled for ODL
+ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-mdsal-apidocs
+ODL_NETVIRT_KARAF_FEATURE+=,odl-l2switch-switch,odl-netvirt-openstack
+
+# for base it should be enabling recent stable/release
+devstack_localrc base enable_plugin networking-odl http://github.com/openstack/networking-odl.git stable/ocata
+
+devstack_localrc target enable_plugin networking-odl http://github.com/openstack/networking-odl.git
 
 for w in base target; do
-    devstack_localrc $w enable_plugin networking-odl http://github.com/openstack/networking-odl.git
     devstack_localrc $w disable_service q-agt
     devstack_localrc $w disable_service q-l3
     devstack_localrc $w enable_service q-dhcp
@@ -19,5 +26,7 @@ for w in base target; do
     devstack_localrc $w Q_USE_PUBLIC_VETH=True
     devstack_localrc $w Q_PUBLIC_VETH_EX=veth-pub-ex
     devstack_localrc $w Q_PUBLIC_VETH_INT=veth-pub-int
-    devstack_localrc $w ODL_PROVIDER_MAPPINGS=${ODL_PROVIDER_MAPPINGS:-br-ex:\${Q_PUBLIC_VETH_INT}}
+    devstack_localrc $w ODL_RELEASE=carbon-snapshot-0.6
+    devstack_localrc $w ODL_PROVIDER_MAPPINGS=public:${Q_PUBLIC_VETH_INT}
+    devstack_localrc $w ODL_NETVIRT_KARAF_FEATURE=${ODL_NETVIRT_KARAF_FEATURE}
 done