diff --git a/etc/scenario/sahara-ci/cdh-5.4.0.yaml.mako b/etc/scenario/sahara-ci/cdh-5.4.0.yaml.mako
index 230676e6..d82d7ae6 100644
--- a/etc/scenario/sahara-ci/cdh-5.4.0.yaml.mako
+++ b/etc/scenario/sahara-ci/cdh-5.4.0.yaml.mako
@@ -1,3 +1,5 @@
+<%page args="is_proxy_gateway='true'"/>
+
 clusters:
   - plugin_name: cdh
     plugin_version: 5.4.0
@@ -44,7 +46,7 @@ clusters:
           - YARN_NODEMANAGER
           - ZOOKEEPER_SERVER
         auto_security_group: true
-        is_proxy_gateway: true
+        is_proxy_gateway: ${is_proxy_gateway}
       - name: master-additional
         flavor: ${medium_flavor_id}
         node_processes:
diff --git a/etc/scenario/sahara-ci/fake.yaml.mako b/etc/scenario/sahara-ci/fake.yaml.mako
index 31b6e143..40296983 100644
--- a/etc/scenario/sahara-ci/fake.yaml.mako
+++ b/etc/scenario/sahara-ci/fake.yaml.mako
@@ -1,3 +1,5 @@
+<%page args="is_proxy_gateway='true'"/>
+
 clusters:
   - plugin_name: fake
     plugin_version: "0.1"
@@ -17,7 +19,7 @@ clusters:
           - jobtracker
           - namenode
         auto_security_group: true
-        is_proxy_gateway: true
+        is_proxy_gateway: ${is_proxy_gateway}
     cluster_template:
       name: fake01
       node_group_templates:
diff --git a/etc/scenario/sahara-ci/hdp-2.0.6.yaml.mako b/etc/scenario/sahara-ci/hdp-2.0.6.yaml.mako
index 8629054a..eba9391e 100644
--- a/etc/scenario/sahara-ci/hdp-2.0.6.yaml.mako
+++ b/etc/scenario/sahara-ci/hdp-2.0.6.yaml.mako
@@ -1,3 +1,5 @@
+<%page args="is_proxy_gateway='true'"/>
+
 clusters:
   - plugin_name: hdp
     plugin_version: 2.0.6
@@ -16,7 +18,7 @@ clusters:
           - SECONDARY_NAMENODE
           - ZOOKEEPER_SERVER
         auto_security_group: true
-        is_proxy_gateway: true
+        is_proxy_gateway: ${is_proxy_gateway}
       - name: worker
         flavor: ${ci_flavor_id}
         node_processes:
diff --git a/etc/scenario/sahara-ci/mapr-4.0.2.mrv2.yaml.mako b/etc/scenario/sahara-ci/mapr-4.0.2.mrv2.yaml.mako
index 6dc99fa3..2a23b7cc 100644
--- a/etc/scenario/sahara-ci/mapr-4.0.2.mrv2.yaml.mako
+++ b/etc/scenario/sahara-ci/mapr-4.0.2.mrv2.yaml.mako
@@ -1,3 +1,5 @@
+<%page args="is_proxy_gateway='true'"/>
+
 clusters:
   - plugin_name: mapr
     plugin_version: 4.0.2.mrv2
@@ -25,7 +27,7 @@ clusters:
         auto_security_group: true
         volumes_per_node: 2
         volumes_size: 20
-        is_proxy_gateway: true
+        is_proxy_gateway: ${is_proxy_gateway}
       - name: worker
         flavor: ${ci_flavor_id}
         node_processes:
diff --git a/etc/scenario/sahara-ci/spark-1.3.1.yaml.mako b/etc/scenario/sahara-ci/spark-1.3.1.yaml.mako
index 375af5a3..ccf8d3bb 100644
--- a/etc/scenario/sahara-ci/spark-1.3.1.yaml.mako
+++ b/etc/scenario/sahara-ci/spark-1.3.1.yaml.mako
@@ -1,3 +1,5 @@
+<%page args="is_proxy_gateway='true'"/>
+
 clusters:
   - plugin_name: spark
     plugin_version: 1.3.1
@@ -9,7 +11,7 @@ clusters:
           - master
           - namenode
         auto_security_group: true
-        is_proxy_gateway: true
+        is_proxy_gateway: ${is_proxy_gateway}
       - name: worker
         flavor: ${ci_flavor_id}
         node_processes:
@@ -32,4 +34,4 @@ clusters:
         size: 1
     edp_jobs_flow:
       - spark_pi
-      - spark_wordcount
\ No newline at end of file
+      - spark_wordcount
diff --git a/etc/scenario/sahara-ci/transient.yaml.mako b/etc/scenario/sahara-ci/transient.yaml.mako
index a8268f62..571726d0 100644
--- a/etc/scenario/sahara-ci/transient.yaml.mako
+++ b/etc/scenario/sahara-ci/transient.yaml.mako
@@ -1,3 +1,5 @@
+<%page args="is_proxy_gateway='true'"/>
+
 clusters:
   - plugin_name: vanilla
     plugin_version: 2.7.1
@@ -28,7 +30,7 @@ clusters:
           - resourcemanager
           - namenode
         auto_security_group: true
-        is_proxy_gateway: true
+        is_proxy_gateway: ${is_proxy_gateway}
     cluster_template:
       name: transient
       node_group_templates:
diff --git a/etc/scenario/sahara-ci/vanilla-2.7.1.yaml.mako b/etc/scenario/sahara-ci/vanilla-2.7.1.yaml.mako
index ee1fc9b8..b1302bdd 100644
--- a/etc/scenario/sahara-ci/vanilla-2.7.1.yaml.mako
+++ b/etc/scenario/sahara-ci/vanilla-2.7.1.yaml.mako
@@ -1,3 +1,5 @@
+<%page args="is_proxy_gateway='true'"/>
+
 clusters:
   - plugin_name: vanilla
     plugin_version: 2.7.1
@@ -39,7 +41,7 @@ clusters:
           - secondarynamenode
           - nodemanager
         auto_security_group: true
-        is_proxy_gateway: true
+        is_proxy_gateway: ${is_proxy_gateway}
     cluster_template:
       name: vanilla271
       node_group_templates: