diff --git a/.gitreview b/.gitreview
index 442948f..f64ef69 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=172.16.48.254
+host=gerrit.mcp.mirantis.net
 port=29418
 project=salt-formulas/runtest.git
diff --git a/runtest/map.jinja b/runtest/map.jinja
index 2067741..4a9e2b8 100644
--- a/runtest/map.jinja
+++ b/runtest/map.jinja
@@ -9,7 +9,9 @@
         'cfg_dir': '/root/',
         'cfg_name': 'tempest.conf',
         'keystonerc': '/root/keystonercv3',
-        'regenerate_conf': false
+        'regenerate_conf': false,
+        'put_keystone_rc_enabled': true,
+        'put_local_image_file_enabled': true
     }
 }, grain='os', merge=salt['pillar.get']('runtest', {}).get('tempest', {}), base='default') %}
 
diff --git a/runtest/tempest.sls b/runtest/tempest.sls
index a2d54e4..fbd60f5 100644
--- a/runtest/tempest.sls
+++ b/runtest/tempest.sls
@@ -14,7 +14,7 @@
     - require:
       - file: tempest_config_dir
 
-{%- if tempest.test_target is defined %}
+  {%- if tempest.test_target is defined %}
 create_on_target:
   salt.function:
     - tgt: {{ tempest.test_target }}
@@ -39,6 +39,7 @@
       - 'mine_function=cmd.shell'
       - 'cat {{ tempest.keystonerc }}'
 
+    {%- if tempest.put_keystone_rc_enabled %}
 put_keystone_rc_file:
   salt.state:
     - tgt: {{ tempest.test_target }}
@@ -47,7 +48,9 @@
     - concurrent: true
     - require:
       - salt: mine_send_keystonerc_file
+    {%- endif %}
 
+    {%- if tempest.put_local_image_file_enabled %}
 put_local_image_file:
   salt.state:
     - tgt: {{ tempest.test_target }}
@@ -58,13 +61,14 @@
     - require:
       - tempest_config_file
     {# Sometimes this task hangs infinitely when using salt 2017.7.0 #}
-    {%- if salt['grains.get']('saltversion') >= '2017.7.0' %}
+      {%- if salt['grains.get']('saltversion') >= '2017.7.0' %}
     - retry:
         attempts: 3
         until: True
         interval: 10
+      {%- endif %}
     {%- endif %}
 
-{%- endif %}
+  {%- endif %}
 
 {%- endif -%}