diff --git a/k8s/workspace/init-workspace.sh b/k8s/workspace/init-workspace.sh
index 0e546aa..972dad0 100644
--- a/k8s/workspace/init-workspace.sh
+++ b/k8s/workspace/init-workspace.sh
@@ -58,6 +58,7 @@
 printf "\n\n# Writing additional options"
 ewriteln "export SI_BINARIES_DIR=$(which helm | rev | cut -d'/' -f2- | rev)"
 ewriteln "export HELM_BINARY_PATH=$(which helm)"
+ewriteln "export K8S_CONFORMANCE_CONCURRENCY=10"
 
 # extract MOS kubeconfig
 echo " "
@@ -111,7 +112,7 @@
     vPUBNET=$(kubectl --kubeconfig $MY_PROJFOLDER/envs/mos-kubeconfig.yaml -n openstack exec ${keystone_pod} -c keystone-client --stdin -- ${cmd})
     echo "-> 'openstack network list --external -c Name -f value': '${vPUBNET}'"
     ewriteln "export TEMPEST_CUSTOM_PUBLIC_NET=${vPUBNET}"
-
+    ewriteln "export TEMPEST_CUSTOM_FLAVOR=cvp.tiny"
     ewriteln "export TEMPEST_CUSTOM_IMAGE=cvp.cirros.51"
     ewriteln "export TEMPEST_CUSTOM_IMAGE_ALT=cvp.cirros.52"
     #prepare tempest custom yaml
diff --git a/k8s/workspace/run-conformance-mcc.sh b/k8s/workspace/run-conformance-mcc.sh
index e30d7a7..f6919a1 100644
--- a/k8s/workspace/run-conformance-mcc.sh
+++ b/k8s/workspace/run-conformance-mcc.sh
@@ -4,6 +4,13 @@
 cd $MY_PROJFOLDER/tmp
 . $MY_PROJFOLDER/envs/mccrc
 . $MY_PROJFOLDER/envs/target-${tenv}
+
+# Setting concurrency
+echo "Current conformance concurrency is ${K8S_CONFORMANCE_CONCURRENCY}"
+export K8S_CONFORMANCE_CONCURRENCY=5
+echo "Using concurrency of ${K8S_CONFORMANCE_CONCURRENCY} for MCC"
+
+# Run tests
 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 b50df73..db6ffac 100644
--- a/k8s/workspace/run-conformance-mos.sh
+++ b/k8s/workspace/run-conformance-mos.sh
@@ -4,6 +4,12 @@
 cd $MY_PROJFOLDER/tmp
 . $MY_PROJFOLDER/envs/mccrc
 . $MY_PROJFOLDER/envs/target-${tenv}
+# Set concurrency
+echo "Current conformance concurrency is ${K8S_CONFORMANCE_CONCURRENCY}"
+export K8S_CONFORMANCE_CONCURRENCY=10
+echo "Using concurrency of ${K8S_CONFORMANCE_CONCURRENCY} for MOS"
+
+# Run tests
 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 e46a1a5..c3cae14 100644
--- a/k8s/workspace/run-k8s-perf.sh
+++ b/k8s/workspace/run-k8s-perf.sh
@@ -14,6 +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 env use kubernetes
         kubectl exec -n qa-space --stdin rally -- rally task start /rally/rally-files/k8s-mos-scn-i100c5.yaml
 	# generate report
 	echo "# Generating report"
diff --git a/k8s/workspace/run-openstack-func-full.sh b/k8s/workspace/run-openstack-func-full.sh
index a11dbe0..c1b0aea 100644
--- a/k8s/workspace/run-openstack-func-full.sh
+++ b/k8s/workspace/run-openstack-func-full.sh
@@ -7,6 +7,11 @@
 # Just in case
 unset TARGET_CLUSTER
 unset TARGET_NAMESPACE
+# Cleaning up
+echo "# Cleaning up '/artifacts/tmp/artifacts/'"
+[ -d "/artifacts/tmp/artifacts/" ] && rm -rf "/artifacts/tmp/artifacts/"
+[ -f "/artifacts/tmp/nosetests.xml" ]  && rm "/artifacts/tmp/nosetests.xml"
+mkdir "/artifacts/tmp/artifacts/"
 
 # 
 echo "# Creating schema"
diff --git a/k8s/workspace/run-openstack-func-smoke.sh b/k8s/workspace/run-openstack-func-smoke.sh
index 340a771..cfa71e3 100644
--- a/k8s/workspace/run-openstack-func-smoke.sh
+++ b/k8s/workspace/run-openstack-func-smoke.sh
@@ -7,6 +7,11 @@
 # Just in case
 unset TARGET_CLUSTER
 unset TARGET_NAMESPACE
+# Cleaning up
+echo "# Cleaning up '/artifacts/tmp/artifacts/'"
+[ -d "/artifacts/tmp/artifacts/" ] && rm -rf "/artifacts/tmp/artifacts/"
+[ -f "/artifacts/tmp/nosetests.xml" ]  && rm "/artifacts/tmp/nosetests.xml"
+mkdir "/artifacts/tmp/artifacts/"
 
 # 
 echo "# Creating schema"