diff --git a/devstack/settings b/devstack/settings
index 9e8d7a1c..f23687df 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -57,6 +57,7 @@ if (is_ceph_enabled_for_service manila); then
 MANILA_OPTGROUP_cephfsnfs1_cephfs_conf_path=${CEPH_CONF_FILE}
 MANILA_OPTGROUP_cephfsnfs1_cephfs_auth_id=${MANILA_CEPH_USER}
 MANILA_OPTGROUP_cephfsnfs1_cephfs_protocol_helper_type=NFS
+ MANILA_OPTGROUP_cephfsnfs1_cephfs_ganesha_server_ip=$HOST_IP
 
 MANILA_OPTGROUP_cephfsnfs1_ganesha_rados_store_enable=${MANILA_CEPH_GANESHA_RADOS_STORE}
 if [ $MANILA_CEPH_GANESHA_RADOS_STORE == 'True' ]; then
diff --git a/manila/post_test_hook.sh b/manila/post_test_hook.sh
index bee8cce7..4afc1c4f 100644
--- a/manila/post_test_hook.sh
+++ b/manila/post_test_hook.sh
@@ -121,6 +121,21 @@ iniset $TEMPEST_CONFIG share run_snapshot_tests $RUN_MANILA_SNAPSHOT_TESTS
 RUN_MANILA_CG_TESTS=${RUN_MANILA_CG_TESTS:-False}
 iniset $TEMPEST_CONFIG share run_consistency_group_tests $RUN_MANILA_CG_TESTS
 
+# NOTE(gouthamr): extra rules are needed to allow VMs to mount storage from
+# the host.
+TCP_PORTS=(2049 111 32803 892 875 662)
+UDP_PORTS=(111 32769 892 875 662)
+for ipcmd in iptables ip6tables; do
+ sudo $ipcmd -N manila-nfs
+ sudo $ipcmd -I INPUT 1 -j manila-nfs
+ for port in ${TCP_PORTS[*]}; do
+ sudo $ipcmd -A manila-nfs -m tcp -p tcp --dport $port -j ACCEPT
+ done
+ for port in ${UDP_PORTS[*]}; do
+ sudo $ipcmd -A manila-nfs -m udp -p udp --dport $port -j ACCEPT
+ done
+done
+
 # Let us control if we die or not.
 set +o errexit
 cd $BASE/new/tempest
@@ -146,13 +161,17 @@ iniset $TEMPEST_CONFIG validation ip_version_for_ssh 4
 iniset $TEMPEST_CONFIG validation ssh_timeout $BUILD_TIMEOUT
 iniset $TEMPEST_CONFIG validation network_for_ssh ${PRIVATE_NETWORK_NAME:-"private"}
 
+_DEFAULT_TEST_CONCURRENCY=8
 echo "Running tempest manila test suites"
 if [[ $MANILA_TEST_TYPE == 'api' ]]; then
 export MANILA_TESTS='manila_tempest_tests.tests.api'
+ _DEFAULT_TEST_CONCURRENCY=12
 elif [[ $MANILA_TEST_TYPE == 'scenario' ]]; then
 export MANILA_TESTS='manila_tempest_tests.tests.scenario'
+else
+ export MANILA_TESTS='manila_tempest_tests.tests'
 fi
-export MANILA_TEMPEST_CONCURRENCY=${MANILA_TEMPEST_CONCURRENCY:-12}
+export MANILA_TEMPEST_CONCURRENCY=${MANILA_TEMPEST_CONCURRENCY:-$_DEFAULT_TEST_CONCURRENCY}
 
 sudo -H -u $USER tempest list-plugins
 sudo -H -u $USER tempest run -r $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY
diff --git a/manila/pre_test_hook.sh b/manila/pre_test_hook.sh
index b2b5ec48..ca079b63 100644
--- a/manila/pre_test_hook.sh
+++ b/manila/pre_test_hook.sh
@@ -51,10 +51,8 @@ echo "DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1">> $localconf
 echo "API_RATE_LIMIT=False">> $localconf
 echo "MANILA_USE_DOWNGRADE_MIGRATIONS=True">> $localconf
 
-
-# NOTE(rraja): Enable when need arises, for example, when the CI does scenario
-# testing.
-echo "MANILA_SERVICE_IMAGE_ENABLED=False">> $localconf
+echo "MANILA_SERVICE_IMAGE_ENABLED=True">> $localconf
+echo "MANILA_USE_SERVICE_INSTANCE_PASSWORD=True">> $localconf
 
 # Enable isolated metadata in Neutron because Tempest creates isolated
 # networks and created VMs in scenario tests don't have access to Nova Metadata
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/devstack-plugin-ceph/commit/90f1d21a839ca80b6f189085310ce9cd12c8267a.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/devstack-plugin-ceph/commit/90f1d21a839ca80b6f189085310ce9cd12c8267a.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>