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 %}