diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh
index f75ee69f23..22ac599c5c 100755
--- a/devstack/upgrade/shutdown.sh
+++ b/devstack/upgrade/shutdown.sh
@@ -12,6 +12,7 @@ set -o errexit
 . $BASE_DEVSTACK_DIR/stackrc # needed for status directory
 
 . $BASE_DEVSTACK_DIR/lib/tls
+. $BASE_DEVSTACK_DIR/lib/apache
 . ${GITDIR[sahara]}/devstack/plugin.sh
 
 set -o xtrace
@@ -20,4 +21,4 @@ export ENABLED_SERVICES+=,sahara-api,sahara-eng,
 stop_sahara
 
 # sanity check that service is actually down
-ensure_services_stopped sahara-api sahara-eng
+ensure_services_stopped sahara-eng
diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh
index 5b10d7db35..f754529b7e 100755
--- a/devstack/upgrade/upgrade.sh
+++ b/devstack/upgrade/upgrade.sh
@@ -65,7 +65,7 @@ $SAHARA_BIN_DIR/sahara-db-manage --config-file $SAHARA_CONF_FILE \
 start_sahara
 
 # Don't succeed unless the service come up
-ensure_services_started sahara
+ensure_services_started sahara-eng
 
 set +o xtrace
 echo "*********************************************************************"