diff --git a/k8s/rally-files/default.yaml.template b/k8s/rally-files/default.yaml.template
new file mode 100644
index 0000000..945e493
--- /dev/null
+++ b/k8s/rally-files/default.yaml.template
@@ -0,0 +1 @@
+heat_template_version: 2015-04-30
diff --git a/k8s/rally-files/init-rally-kube.sh b/k8s/rally-files/init-rally-kube.sh
index 955f8d5..405a060 100644
--- a/k8s/rally-files/init-rally-kube.sh
+++ b/k8s/rally-files/init-rally-kube.sh
@@ -4,7 +4,7 @@
 # Configure kubernetes
 # Check and prepare kubespec file
 if [ ! -f /artifacts/kubespec_generated.yaml ]; then
-    sudo bash /opt/res-files/k8s/rally-files/gen_kubespec.sh /artifacts/mos-kubeconf.yaml
+    sudo bash /rally/rally-files/gen_kubespec.sh /artifacts/mos-kubeconfig.yaml
 fi
 # Create kubernetes env
 rally env create --name kubernetes --spec /artifacts/kubespec_generated.yaml
diff --git a/k8s/rally-files/openstack-mos-scn-i1-static-users.json b/k8s/rally-files/openstack-mos-scn-i1-static-users.json
index 4dfc36a..0faa558 100644
--- a/k8s/rally-files/openstack-mos-scn-i1-static-users.json
+++ b/k8s/rally-files/openstack-mos-scn-i1-static-users.json
@@ -7,7 +7,7 @@
 {% set users = 1 %}
 {% set tenants = 1 %}
 {% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
-{% set heat_template = "/artifacts/default.yaml.template" %}
+{% set heat_template = "/rally/rally-files/default.yaml.template" %}
 {% set fixed_net = "id" %}
 
 {
diff --git a/k8s/rally-files/openstack-mos-scn-i1.json b/k8s/rally-files/openstack-mos-scn-i1.json
index 7752c1f..d67156c 100644
--- a/k8s/rally-files/openstack-mos-scn-i1.json
+++ b/k8s/rally-files/openstack-mos-scn-i1.json
@@ -7,7 +7,7 @@
 {% set users = 1 %}
 {% set tenants = 1 %}
 {% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
-{% set heat_template = "/artifacts/res-files/rally/default.yaml.template" %}
+{% set heat_template = "/rally/rally-files/res-files/rally/default.yaml.template" %}
 {% set fixed_net = "id" %}
 
 {
diff --git a/k8s/rally-files/openstack-mos-scn-i100-static-users.json b/k8s/rally-files/openstack-mos-scn-i100-static-users.json
index 0eecdbc..4212372 100644
--- a/k8s/rally-files/openstack-mos-scn-i100-static-users.json
+++ b/k8s/rally-files/openstack-mos-scn-i100-static-users.json
@@ -7,7 +7,7 @@
 {% set users = 5 %}
 {% set tenants = 4 %}
 {% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
-{% set heat_template = "/artifacts/default.yaml.template" %}
+{% set heat_template = "/rally/rally-files/default.yaml.template" %}
 {% set fixed_net = "id" %}
 
 {
diff --git a/k8s/rally-files/openstack-mos-scn-i100.json b/k8s/rally-files/openstack-mos-scn-i100.json
index 262a67d..20a388a 100644
--- a/k8s/rally-files/openstack-mos-scn-i100.json
+++ b/k8s/rally-files/openstack-mos-scn-i100.json
@@ -8,7 +8,7 @@
 {% set image_name = image_name or "cvp.cirros.51" %}
 {% set availability_zone = "nova" %}
 {% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
-{% set heat_template = "/artifacts/default.yaml.template" %}
+{% set heat_template = "/rally/rally-files/default.yaml.template" %}
 {% set fixed_net = "id" %}
 
 {