diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index 58809133..93c9a3d1 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -14,7 +14,7 @@ devstack_localrc base IMAGE_URLS=\
 http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2"
 devstack_localrc base enable_plugin sahara \
                                     git://git.openstack.org/openstack/sahara \
-                                    stable/liberty
+                                    stable/mitaka
 devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.2-x86_64-uec"
 devstack_localrc target disable_service n-net
 devstack_localrc target enable_service \
diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh
index a6daa569..d6378000 100755
--- a/devstack/upgrade/shutdown.sh
+++ b/devstack/upgrade/shutdown.sh
@@ -16,7 +16,8 @@ source ${GITDIR[sahara]}/devstack/plugin.sh
 
 set -o xtrace
 
+export ENABLED_SERVICES+=,sahara-api,sahara-eng,
 stop_sahara
 
 # sanity check that service is actually down
-ensure_services_stopped sahara-all
+ensure_services_stopped sahara-api sahara-eng