diff --git a/k8s/rally-files/openstack-mos-scn-i1.json b/k8s/rally-files/openstack-mos-scn-i1.json
index ef64ec9..2497ec9 100644
--- a/k8s/rally-files/openstack-mos-scn-i1.json
+++ b/k8s/rally-files/openstack-mos-scn-i1.json
@@ -1,6 +1,6 @@
 {% set flavor_name = flavor_name or "cvp.tiny" %}
 {% set image_name = image_name or "cvp.cirros.61" %}
-{% set availability_zone = "nova" %}
+{% set availability_zone = "default-az-name" %}
 {% set concurrency = 1 %}
 {% set volume_size = 1 %}
 {% set times = 1 %}
diff --git a/k8s/rally-files/openstack-mos-scn-i100.json b/k8s/rally-files/openstack-mos-scn-i100.json
index 4d554fb..2a444b8 100644
--- a/k8s/rally-files/openstack-mos-scn-i100.json
+++ b/k8s/rally-files/openstack-mos-scn-i100.json
@@ -6,7 +6,7 @@
 
 {% set flavor_name = flavor_name or "cvp.tiny" %}
 {% set image_name = image_name or "cvp.cirros.61" %}
-{% set availability_zone = "nova" %}
+{% set availability_zone = "default-az-name" %}
 {% set rbd_image = "https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" %}
 {% set heat_template = "/rally/rally-files/default.yaml.template" %}
 {% set fixed_net = "fixed-net-id" %}
diff --git a/k8s/rally-files/openstack-mos-scn.json.clean b/k8s/rally-files/openstack-mos-scn.json.clean
index 81807c4..6582426 100644
--- a/k8s/rally-files/openstack-mos-scn.json.clean
+++ b/k8s/rally-files/openstack-mos-scn.json.clean
@@ -6,7 +6,7 @@
 
 {% set flavor_name = flavor_name or "cvp.tiny" %}
 {% set image_name = image_name or "cvp.cirros.61" %}
-{% set availability_zone = "nova" %}
+{% set availability_zone = "default-az-name" %}
 {% set rbd_image = "https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" %}
 {% set heat_template = "/rally/rally-files/default.yaml.template" %}
 {% set fixed_net = "fixed-net-id" %}
diff --git a/k8s/workspace/run-openstack-perf.sh b/k8s/workspace/run-openstack-perf.sh
index ddc8798..3f0cdba 100644
--- a/k8s/workspace/run-openstack-perf.sh
+++ b/k8s/workspace/run-openstack-perf.sh
@@ -46,11 +46,14 @@
 		scenario=/rally/rally-files/openstack-mos-scn.json.clean
 	fi
 	task_scn=/artifacts/openstack-scenario.json
-        # prepare scenario
-        kexec "cp -v ${scenario} ${task_scn}"
+  # prepare scenario
+  kexec "cp -v ${scenario} ${task_scn}"
+  default_az=$(kubectl exec toolset --stdin -n qa-space -- bash -c "openstack compute service list --service nova-compute  -c Zone -f value | uniq | head -n 1")
 	declare $(kubectl exec toolset --stdin -n qa-space -- bash -c "cat /artifacts/cmp-check/cvp.manifest")
 	echo "# Updating network UUID to ${fixed_net_left_id}"
 	kexec "sed -i \"s/fixed-net-id/${fixed_net_left_id}/g\" ${task_scn}"
+	echo "# Updating AZ name to ${default_az}"
+	kexec "sed -i \"s/default-az-name/${default_az}/g\" ${task_scn}"
 	echo "# Updating concurrency to ${concurrency}"
 	kexec "sed -i \"s/concurrent-threads/${concurrency}/g\" ${task_scn}"
 	echo "# Updating running times to ${run_times}"