diff --git a/Dockerfile b/Dockerfile
index bbabdf8..6ea3b46 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,9 @@
 RUN mkdir -p cvp-configuration
 
 RUN git clone https://github.com/openstack/tempest && \
-    pushd tempest; git checkout 18.0.0; pip install -r requirements.txt; \
+    pushd tempest; git checkout 18.0.0; \
+    sed -i 's/length=15/length=32/g' /var/lib/tempest/tempest/lib/common/utils/data_utils.py; \
+    pip install -r requirements.txt; \
     popd;
 
 RUN git clone https://github.com/openstack/heat-tempest-plugin && \
@@ -20,8 +22,6 @@
 
 RUN pip install --force-reinstall python-cinderclient==3.2.0 python-glanceclient==2.11
 
-RUN sed -i 's/length=15/length=32/g' /var/lib/tempest/tempest/lib/common/utils/data_utils.py
-RUN sed -i 's/length=15/length=32/g' /usr/local/lib/python2.7/dist-packages/tempest/lib/common/utils/data_utils.py
 RUN sed -i 's/uuid4())/uuid4()).replace("-","")/g' /usr/local/lib/python2.7/dist-packages/rally/plugins/openstack/scenarios/keystone/utils.py
 RUN sed -i 's/uuid4())/uuid4()).replace("-","")/g' /usr/local/lib/python2.7/dist-packages/rally/plugins/openstack/context/keystone/users.py
 
diff --git a/configure.sh b/configure.sh
index 7d37f6a..c19b3c3 100755
--- a/configure.sh
+++ b/configure.sh
@@ -122,12 +122,11 @@
 sed -i 's|${OS_AUTH_URL}|'"${OS_AUTH_URL}"'|g' $current_path/cvp-configuration/tempest/tempest_ext.conf
 sed -i 's|${OS_PASSWORD}|'"${OS_PASSWORD}"'|g' $current_path/cvp-configuration/tempest/tempest_ext.conf
 sed -i 's|${PUBLIC_NET}|'"${PUBLIC_NET}"'|g' $current_path/cvp-configuration/tempest/tempest_ext.conf
-sed -i 's|${PUBLIC_NET}|'"${PUBLIC_NET}"'|g' $current_path/cvp-configuration/rally/rally_scenarios_fip_and_ubuntu.json
-sed -i 's|${PUBLIC_NET}|'"${PUBLIC_NET}"'|g' $current_path/cvp-configuration/rally/rally_scenarios_fip_and_ubuntu_100.json
 sed -i 's/publicURL/'$TEMPEST_ENDPOINT_TYPE'/g' $current_path/cvp-configuration/tempest/tempest_ext.conf
 #supress tempest.conf display in console
 #cat $current_path/cvp-configuration/tempest/tempest_ext.conf
 cp $current_path/cvp-configuration/tempest/boot_config_none_env.yaml /home/rally/boot_config_none_env.yaml
+cp $current_path/cvp-configuration/rally/default.yaml.template /home/rally/default.yaml.template
 cp $current_path/cvp-configuration/rally/instance_test.sh /home/rally/instance_test.sh
 cp $current_path/cvp-configuration/cleanup.sh /home/rally/cleanup.sh
 chmod 755 /home/rally/cleanup.sh
diff --git a/rally/rally_scenarios.json b/rally/rally_scenarios.json
index 4e02e57..60fd3ee 100644
--- a/rally/rally_scenarios.json
+++ b/rally/rally_scenarios.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 = "/home/rally/boot_config_none_env.yaml" %}
+{% set heat_template = "/home/rally/default.yaml.template" %}
 {% set fixed_net = "${FIXED_NET}" %}
 {
   "KeystoneBasic.authenticate_user_and_validate_token": [
diff --git a/rally/rally_scenarios_100.json b/rally/rally_scenarios_100.json
index 4c3ba62..07bac67 100644
--- a/rally/rally_scenarios_100.json
+++ b/rally/rally_scenarios_100.json
@@ -7,7 +7,7 @@
 {% set users = 3 %}
 {% set tenants = 3 %}
 {% set rbd_image = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %}
-{% set heat_template = "/home/rally/boot_config_none_env.yaml" %}
+{% set heat_template = "/home/rally/default.yaml.template" %}
 {% set fixed_net = "${FIXED_NET}" %}
 {
   "KeystoneBasic.authenticate_user_and_validate_token": [
diff --git a/rally/rally_scenarios_fip_and_ubuntu.json b/rally/rally_scenarios_fip_and_ubuntu.json
index 153a615..955c6f0 100644
--- a/rally/rally_scenarios_fip_and_ubuntu.json
+++ b/rally/rally_scenarios_fip_and_ubuntu.json
@@ -7,7 +7,7 @@
 {% set times = 1 %}
 {% set users = 1 %}
 {% set tenants = 1 %}
-{% set ext_net_id = "${PUBLIC_NET}" %}
+{% set ext_net_id = "EXT_NET_ID" %}
 {% set fixed_net = "${FIXED_NET}" %}
 {% set script_file = script_file or "/home/rally/instance_test.sh" %}
 {% set block_migration = false %}
diff --git a/rally/rally_scenarios_fip_and_ubuntu_100.json b/rally/rally_scenarios_fip_and_ubuntu_100.json
index 2e6f7b9..64f4d7a 100644
--- a/rally/rally_scenarios_fip_and_ubuntu_100.json
+++ b/rally/rally_scenarios_fip_and_ubuntu_100.json
@@ -7,7 +7,7 @@
 {% set times = 100 %}
 {% set users = 3 %}
 {% set tenants = 3 %}
-{% set ext_net_id = "${PUBLIC_NET}" %}
+{% set ext_net_id = "EXT_NET_ID" %}
 {% set fixed_net = "${FIXED_NET}" %}
 {% set script_file = script_file or "/home/rally/instance_test.sh" %}
 {% set block_migration = false %}