diff --git a/k8s/workspace/run-conformance-mcc.sh b/k8s/workspace/run-conformance-mcc.sh
index fab3edc..e30d7a7 100644
--- a/k8s/workspace/run-conformance-mcc.sh
+++ b/k8s/workspace/run-conformance-mcc.sh
@@ -2,8 +2,8 @@
 tenv=mcc
 . /opt/si-tests/.sivenv/bin/activate
 cd $MY_PROJFOLDER/tmp
-. $MY_PROJFOLDER/${tenv}rc
-. $MY_PROJFOLDER/target-${tenv}
+. $MY_PROJFOLDER/envs/mccrc
+. $MY_PROJFOLDER/envs/target-${tenv}
 pytest /opt/si-tests/si_tests/tests/deployment/test_k8s_conformance.py
 unset TARGET_CLUSTER
 unset TARGET_NAMESPACE
diff --git a/k8s/workspace/run-conformance-mos.sh b/k8s/workspace/run-conformance-mos.sh
index bc352a3..b50df73 100644
--- a/k8s/workspace/run-conformance-mos.sh
+++ b/k8s/workspace/run-conformance-mos.sh
@@ -2,8 +2,8 @@
 tenv=mos
 . /opt/si-tests/.sivenv/bin/activate
 cd $MY_PROJFOLDER/tmp
-. $MY_PROJFOLDER/${tenv}rc
-. $MY_PROJFOLDER/target-${tenv}
+. $MY_PROJFOLDER/envs/mccrc
+. $MY_PROJFOLDER/envs/target-${tenv}
 pytest /opt/si-tests/si_tests/tests/deployment/test_k8s_conformance.py
 unset TARGET_CLUSTER
 unset TARGET_NAMESPACE
diff --git a/k8s/workspace/run-k8s-perf.sh b/k8s/workspace/run-k8s-perf.sh
index 919bf36..e46a1a5 100644
--- a/k8s/workspace/run-k8s-perf.sh
+++ b/k8s/workspace/run-k8s-perf.sh
@@ -14,7 +14,7 @@
         kubectl exec -n qa-space --stdin rally -- rally env list
 else
         echo "# Running k8s performance tests"
-        #kubectl exec -n qa-space --stdin rally -- rally task start /rally/rally-files/k8s-mos-scn-i100c5.yaml
+        kubectl exec -n qa-space --stdin rally -- rally task start /rally/rally-files/k8s-mos-scn-i100c5.yaml
 	# generate report
 	echo "# Generating report"
 	fname=$MY_CLIENTSHORTNAME-mos-k8s-perf-latest.html
diff --git a/k8s/workspace/run-openstack-spt.sh b/k8s/workspace/run-openstack-spt.sh
index 156fd1d..bf86d98 100644
--- a/k8s/workspace/run-openstack-spt.sh
+++ b/k8s/workspace/run-openstack-spt.sh
@@ -12,10 +12,10 @@
 if [ ! -z ${TEMPEST_CUSTOM_PUBLIC_NET+x} ]; then
         echo "# Copying global_config.yaml"
         kubectl cp $MY_PROJFOLDER/yamls/global_config.yaml qa-space/toolset:/opt/mos-spt/global_config.yaml
-        echo " "
-        echo "# Running spt checks"
+    echo " "
+    echo "# Running spt checks"
 	echo " "
-	kubectl exec toolset --stdin --tty -n qa-space -- bash -c "cd /opt/mos-spt; . .venv/bin/activate; pytest -rs -o log_cli=true --tb=short tests/test_vm2vm.py"
+	kubectl exec toolset --stdin --tty -n qa-space -- bash -c "cd /opt/mos-spt; . .venv/bin/activate; pytest -rs -o log_cli=true --tb=short tests/"
 else
         echo "# Public network not set: TEMPEST_CUSTOM_PUBLIC_NET=${TEMPEST_CUSTOM_PUBLIC_NET}"
 	exit 1
diff --git a/k8s/workspace/update-openstack-resources.sh b/k8s/workspace/update-openstack-resources.sh
index f566676..e7543b1 100644
--- a/k8s/workspace/update-openstack-resources.sh
+++ b/k8s/workspace/update-openstack-resources.sh
@@ -30,7 +30,10 @@
 declare $(kubectl exec toolset --stdin -n qa-space -- bash -c "cat /artifacts/cmp-check/cvp.manifest")
 echo "# Getting network details"
 netid=$(kubectl exec toolset --stdin -n qa-space -- openstack network show ${TEMPEST_CUSTOM_PUBLIC_NET} -c id -f value)
-subnetid=$(kubectl exec toolset --stdin -n qa-space -- openstack subnet list -f value | grep ${TEMPEST_CUSTOM_PUBLIC_NET} | cut -d' ' -f1)
+subnetid=$(kubectl exec toolset --stdin -n qa-space -- openstack subnet list -f value | grep ${netid} | cut -d' ' -f1)
+echo "# image_ref_name -> ${cirros51_name}"
+sed -i "s/image_ref_name/${cirros51_name}/g" $MY_PROJFOLDER/yamls/tempest_custom.yaml
+image_ref_name
 echo "# image_ref_uuid -> ${cirros51_id}"
 sed -i "s/image_ref_uuid/${cirros51_id}/g" $MY_PROJFOLDER/yamls/tempest_custom.yaml
 echo "# image_ref_alt_uuid -> ${cirros52_id}"
@@ -45,6 +48,8 @@
 
 echo "# Updating SPT global_config.yaml"
 cp -v /opt/res-files/k8s/yamls/spt_global_config.yaml.clean $MY_PROJFOLDER/yamls/global_config.yaml
+echo "# image_ref_name -> ${ubuntu20_name}"
+sed -i "s/image_ref_name/${ubuntu20_name}/g" $MY_PROJFOLDER/yamls/global_config.yaml
 echo "# s/public-network-name/ -> ${TEMPEST_CUSTOM_PUBLIC_NET}"
 sed -i "s/public-network-name/${TEMPEST_CUSTOM_PUBLIC_NET}/g" $MY_PROJFOLDER/yamls/global_config.yaml
 echo "# s/mtu-value/ -> default"
diff --git a/k8s/yamls/spt_global_config.yaml.clean b/k8s/yamls/spt_global_config.yaml.clean
index 751ef62..4b522e5 100644
--- a/k8s/yamls/spt_global_config.yaml.clean
+++ b/k8s/yamls/spt_global_config.yaml.clean
@@ -4,7 +4,7 @@
 
 # parameters for vm2vm test
 CMP_HOSTS: []
-image_name: "cvp.ubuntu.2004" # Use Ubuntu 20.04 LTS image
+image_name: "image_ref_name" # Use Ubuntu 20.04 LTS image
 flavor_name: 'spt-test'
 flavor_ram: 1536
 flavor_vcpus: 1
diff --git a/k8s/yamls/tempest_custom.yaml.clean b/k8s/yamls/tempest_custom.yaml.clean
index 83b5acd..afdb6e5 100644
--- a/k8s/yamls/tempest_custom.yaml.clean
+++ b/k8s/yamls/tempest_custom.yaml.clean
@@ -22,8 +22,8 @@
     floating_network_name: public_net_name
     network_for_ssh: public_net_name
     fixed_subnet_name: cvp.subnet.1
-    image_ref: cvp.cirros.51
-    minimal_image_ref: cvp.cirros.51
+    image_ref: image_ref_name
+    minimal_image_ref: image_ref_name
 network:
     subnet_id: public_subnet_uuid
     public_network_id: public_net_uuid
@@ -35,3 +35,6 @@
     ssh_timeout: 60
     connect_timeout: 10
     ping_timeout: 10
+octavia:
+    availability_zone: nova
+    availability_zone2: nova