diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index 30bd8fdc6..70236ee84 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -1,6 +1,28 @@
 register_project_for_upgrade barbican
 register_db_to_save barbican
 
+# NOTE(hieulq): devstack ocata and master use different default image (ocata-uec, master-qcow2), thus the grenade test will fail
+# We should config the same image for base and target devstack, and remove this config when devstack fixes are proposed
+DOWNLOAD_DEFAULT_IMAGES=False
+CIRROS_VERSION=$(set +o xtrace &&
+                 source $BASE_DEVSTACK_DIR/stackrc &&
+                 echo $CIRROS_VERSION)
+CIRROS_ARCH=$(set +o xtrace &&
+              source $BASE_DEVSTACK_DIR/stackrc &&
+              echo $CIRROS_ARCH)
+DEFAULT_IMAGE_FILE_NAME=cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img
+devstack_localrc base DEFAULT_IMAGE_FILE_NAME=${DEFAULT_IMAGE_FILE_NAME}
+devstack_localrc base IMAGE_URLS="http://download.cirros-cloud.net/${CIRROS_VERSION}/${DEFAULT_IMAGE_FILE_NAME}"
+devstack_localrc base DOWNLOAD_DEFAULT_IMAGES=False
+devstack_localrc base SCENARIO_IMAGE_DIR="$BASE_DEVSTACK_DIR/files"
+devstack_localrc base DEFAULT_IMAGE_NAME=cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk
+devstack_localrc target DEFAULT_IMAGE_NAME=cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk
+
+devstack_localrc base """
+[[test-config|\$TEMPEST_CONFIG]]
+[image-feature-enabled]
+api_v1=False"""
+
 devstack_localrc base enable_plugin barbican https://git.openstack.org/openstack/barbican
 devstack_localrc target enable_plugin barbican https://git.openstack.org/openstack/barbican
 
diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh
index 8bc2184dd..8b1f8d1cb 100755
--- a/devstack/upgrade/shutdown.sh
+++ b/devstack/upgrade/shutdown.sh
@@ -21,9 +21,18 @@ source $BASE_DEVSTACK_DIR/functions
 source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
 source $BASE_DEVSTACK_DIR/lib/tls
 source $BASE_DEVSTACK_DIR/lib/apache
+source $BASE_DEVSTACK_DIR/lib/nova
 
 BARBICAN_DEVSTACK_DIR=$(dirname "$0")/..
 source $BARBICAN_DEVSTACK_DIR/lib/barbican
 set -o xtrace
 
 stop_barbican
+
+# After shutdown barbican service, it needs to add an1 option to nova.conf
+# The option will useful for running barbican tempest test
+echo "Update nova.conf file with this option"
+echo "enable image signature verification in Nova in target version only"
+echo "[glance]"
+echo "verify_glance_signatures = True"
+iniset $NOVA_CONF glance verify_glance_signatures "True"