diff --git a/tcp_tests/templates/runtest.yml b/tcp_tests/templates/runtest.yml
index 573bd54..297d3e7 100644
--- a/tcp_tests/templates/runtest.yml
+++ b/tcp_tests/templates/runtest.yml
@@ -30,10 +30,6 @@
         min_microversion: 2.1
         max_microversion: 2.53
         min_compute_nodes: 2
-        volume_device_name: 'vdc'
-      orchestration:
-        max_template_size: 5440000
-        max_resources_per_stack: 20000
       dns_feature_enabled:
         # Switch this to designate_admin_api_enabled once [1] is promoted to stable packages
         # [1] https://gerrit.mcp.mirantis.net/gitweb?p=salt-formulas/designate.git;a=commit;h=96a3f43f6cf1149559e54a00b5548bdf46333749
@@ -43,11 +39,6 @@
         api_v2_quotas: true
         api_v2_root_recordsets: true
         bug_1573141_fixed: true
-      volume-feature-enabled:
-        backup: false
-      volume:
-        storage_protocol: iSCSI
-        build_timeout: 300
       share:
         min_api_microversion: 2.0
         max_api_microversion: 2.40
diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 98f18e3..b91b5bf 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -1058,6 +1058,8 @@
 - description: Include class with tempest template into cfg node
   cmd: |
     sed -i 's/classes\:/classes\:\n- cluster.{{ CLUSTER_NAME }}.infra.runtest/g' /srv/salt/reclass/nodes/_generated/cfg01.{{ DOMAIN_NAME }}.yml;
+    git clone https://gerrit.mcp.mirantis.net/salt-formulas/runtest;
+    cd /root/runtest && make install;
     salt 'cfg01*' saltutil.refresh_pillar;
     salt 'cfg01*' saltutil.sync_all;
   node_name: {{ HOSTNAME_CFG01 }}
@@ -1092,16 +1094,6 @@
   retry: {count: 1, delay: 5}
   skip_fail: false
 
-- description: Temp WR for PROD-19442
-  cmd: |
-    apt-get install crudini -y;
-    crudini --verbose --set /root/test/tempest.conf validation connect_method floating;
-    crudini --verbose --set /root/test/tempest.conf validation run_validation  True;
-    crudini --verbose --set /root/test/tempest.conf validation image_ssh_user cirros;
-  node_name: {{ HOSTNAME_GTW01 }}
-  retry: {count: 1, delay: 30}
-  skip_fail: true
-
 - description: Run tempest from new docker image
   cmd: |
     docker run -e ARGS="-r {{TEMPEST_PATTERN }} -w 4 {{ EXCLUDE_TEST_ARGS }}" -v /root/test/tempest.conf:/etc/tempest/tempest.conf -v /tmp/:/tmp/ -v /root/test:/root/tempest -v /etc/ssl/certs/:/etc/ssl/certs/ --rm docker-prod-virtual.docker.mirantis.net/mirantis/cicd/ci-tempest /bin/bash -c "run-tempest"