diff --git a/jobs/pipelines/deploy-cicd-and-run-tests.groovy b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
index 1e35c9e..10536c7 100644
--- a/jobs/pipelines/deploy-cicd-and-run-tests.groovy
+++ b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
@@ -32,18 +32,6 @@
             shared.prepare_working_dir(env_manager)
         }
 
-        // Reboot Hardware before the BM deployments
-        if ("$ENV_NAME".contains("bm-")){
-            reboot_hw_nodes = env.REBOOT_HW_NODES ?: false
-            stage("Reboot HW nodes") {
-                if (reboot_hw_nodes) {
-                    shared.reboot_hardware_nodes()
-                } else {
-                    common.printMsg("REBOOT_HW_NODES is disabled. Skipping this stage...", "blue")
-                }
-            }
-        }
-
         stage("Create environment, generate model, bootstrap the salt-cluster") {
             // steps: "hardware,create_model,salt"
             if (env_manager == 'devops') {
diff --git a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
index fbd3355..f4bbdb7 100644
--- a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
@@ -171,7 +171,7 @@
         name: OS_CREDENTIALS
         trim: 'false'
     - string:
-        default: eu-cloud.env
+        default: eu-cloud-low-flavors.env
         description: |-
           Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/,
           for example: microcloud-8116.env
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
index 26c84d9..dee912d 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
@@ -171,7 +171,7 @@
         name: OS_CREDENTIALS
         trim: 'false'
     - string:
-        default: eu-cloud.env
+        default: eu-cloud-low-flavors.env
         description: |-
           Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/,
           for example: microcloud-8116.env
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
index 91895e8..d70132c 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
@@ -171,7 +171,7 @@
         name: OS_CREDENTIALS
         trim: 'false'
     - string:
-        default: eu-cloud.env
+        default: eu-cloud-low-flavors.env
         description: |-
           Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/,
           for example: microcloud-8116.env
diff --git a/jobs/templates/bm-cicd-pike-ovs-maas.yml b/jobs/templates/bm-cicd-pike-ovs-maas.yml
index 6b30a2a..cd44b20 100644
--- a/jobs/templates/bm-cicd-pike-ovs-maas.yml
+++ b/jobs/templates/bm-cicd-pike-ovs-maas.yml
@@ -159,7 +159,7 @@
         name: OS_CREDENTIALS
         trim: 'false'
     - string:
-        default: eu-cloud.env
+        default: eu-cloud-low-flavors.env
         description: |-
           Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/
           , for example: microcloud-8116.env
@@ -199,10 +199,6 @@
         default: true
         description: 'Works starting from MCP 2019.2.10 or master. Whether to apply saltstack updates on all nodes in cluster before deployment'
         name: UPGRADE_SALTSTACK
-    - bool:
-        default: true
-        description: Reboot hardware servers and set boot to PXE before the deployment
-        name: REBOOT_HW_NODES
     pipeline-scm:
       lightweight-checkout: false
       scm:
diff --git a/jobs/templates/bm-cicd-queens-ovs-maas.yml b/jobs/templates/bm-cicd-queens-ovs-maas.yml
index 95b0343..b8f2ccc 100644
--- a/jobs/templates/bm-cicd-queens-ovs-maas.yml
+++ b/jobs/templates/bm-cicd-queens-ovs-maas.yml
@@ -159,7 +159,7 @@
         name: OS_CREDENTIALS
         trim: 'false'
     - string:
-        default: eu-cloud.env
+        default: eu-cloud-low-flavors.env
         description: |-
           Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/
           , for example: microcloud-8116.env
@@ -212,10 +212,6 @@
         default: false
         description: 'Works starting from MCP 2019.2.10 or master. Whether to apply saltstack updates on all nodes in cluster before deployment'
         name: UPGRADE_SALTSTACK
-    - bool:
-        default: true
-        description: Reboot hardware servers and set boot to PXE before the deployment
-        name: REBOOT_HW_NODES
     pipeline-scm:
       lightweight-checkout: false
       scm:
diff --git a/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml b/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml
index 531b1e9..ba5b6da 100644
--- a/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml
+++ b/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml
@@ -166,7 +166,7 @@
         name: OS_CREDENTIALS
         trim: 'false'
     - string:
-        default: eu-cloud.env
+        default: eu-cloud-low-flavors.env
         description: |-
           Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/
           , for example: microcloud-8116.env
@@ -225,10 +225,6 @@
         default: true
         description: 'Works starting from MCP 2019.2.10 or master. Whether to apply saltstack updates on all nodes in cluster before deployment'
         name: UPGRADE_SALTSTACK
-    - bool:
-        default: true
-        description: Reboot hardware servers and set boot to PXE before the deployment
-        name: REBOOT_HW_NODES
     pipeline-scm:
       lightweight-checkout: false
       scm:
diff --git a/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml b/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
index 09cd0fb..a46b7c1 100644
--- a/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
+++ b/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
@@ -167,7 +167,7 @@
         name: OS_CREDENTIALS
         trim: 'false'
     - string:
-        default: eu-cloud.env
+        default: eu-cloud-low-flavors.env
         description: |-
           Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/
           , for example: microcloud-8116.env
@@ -226,10 +226,6 @@
         default: false
         description: 'Works starting from MCP 2019.2.10 or master. Whether to apply saltstack updates on all nodes in cluster before deployment'
         name: UPGRADE_SALTSTACK
-    - bool:
-        default: true
-        description: Reboot hardware servers and set boot to PXE before the deployment
-        name: REBOOT_HW_NODES
     pipeline-scm:
       lightweight-checkout: false
       scm:
diff --git a/jobs/templates/heat-cicd-pike-dvr-sl.yml b/jobs/templates/heat-cicd-pike-dvr-sl.yml
index 5128bd5..31623fc 100644
--- a/jobs/templates/heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-pike-dvr-sl.yml
@@ -176,7 +176,7 @@
         name: OS_CREDENTIALS
         trim: 'false'
     - string:
-        default: eu-cloud.env
+        default: eu-cloud-low-flavors.env
         description: |-
           Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/
           , for example: microcloud-8116.env
diff --git a/jobs/templates/heat-cicd-queens-contrail41-sl.yml b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
index 029c090..3a17c80 100644
--- a/jobs/templates/heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
@@ -169,7 +169,7 @@
         name: OS_CREDENTIALS
         trim: 'false'
     - string:
-        default: eu-cloud.env
+        default: eu-cloud-low-flavors.env
         description: |-
           Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/,
           for example: microcloud-8116.env
diff --git a/jobs/templates/heat-cicd-queens-dvr-sl.yml b/jobs/templates/heat-cicd-queens-dvr-sl.yml
index d3bb4c6..e138c6e 100644
--- a/jobs/templates/heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-queens-dvr-sl.yml
@@ -170,7 +170,7 @@
         name: OS_CREDENTIALS
         trim: 'false'
     - string:
-        default: eu-cloud.env
+        default: eu-cloud-low-flavors.env
         description: |-
           Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/,
           for example: microcloud-8116.env
diff --git a/jobs/templates/released-bm-pike-ovs.yml b/jobs/templates/released-bm-pike-ovs.yml
index 4c96960..5daf58b 100644
--- a/jobs/templates/released-bm-pike-ovs.yml
+++ b/jobs/templates/released-bm-pike-ovs.yml
@@ -154,7 +154,7 @@
         name: OS_CREDENTIALS
         trim: 'false'
     - string:
-        default: eu-cloud.env
+        default: eu-cloud-low-flavors.env
         description: |-
           Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/
           , for example: microcloud-8116.env
diff --git a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
index 7789c7d..fbd19fd 100644
--- a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
@@ -186,7 +186,7 @@
         name: OS_CREDENTIALS
         trim: 'false'
     - string:
-        default: eu-cloud.env
+        default: eu-cloud-low-flavors.env
         description: |-
           Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/
           , for example: microcloud-8116.env
diff --git a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
index be08433..ad28b00 100644
--- a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
@@ -185,7 +185,7 @@
         name: OS_CREDENTIALS
         trim: 'false'
     - string:
-        default: eu-cloud.env
+        default: eu-cloud-low-flavors.env
         description: |-
           Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/
           , for example: microcloud-8116.env
diff --git a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
index 60a4372..585b2c9 100644
--- a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
@@ -183,7 +183,7 @@
         name: OS_CREDENTIALS
         trim: 'false'
     - string:
-        default: eu-cloud.env
+        default: eu-cloud-low-flavors.env
         description: |-
           Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/,
           for example: microcloud-8116.env
diff --git a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
index 0c0cb08..6caec65 100644
--- a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
@@ -185,7 +185,7 @@
         name: OS_CREDENTIALS
         trim: 'false'
     - string:
-        default: eu-cloud.env
+        default: eu-cloud-low-flavors.env
         description: |-
           Heat template environment filename with 'parameter_defaults' dict, placed in tcp_tests/templates/_heat_environments/
           , for example: microcloud-8116.env
diff --git a/src/com/mirantis/system_qa/SharedPipeline.groovy b/src/com/mirantis/system_qa/SharedPipeline.groovy
index c42d43f..72ff052 100644
--- a/src/com/mirantis/system_qa/SharedPipeline.groovy
+++ b/src/com/mirantis/system_qa/SharedPipeline.groovy
@@ -780,33 +780,3 @@
     return ret
   }
 }
-
-def reboot_hardware_nodes() {
-    bm_ips = [
-        "185.8.59.227",
-        "185.8.59.229",
-        "5.43.225.88",
-        "5.43.225.112",
-        "5.43.225.208",
-        "5.43.227.118",
-        "185.8.58.248",
-        "185.8.59.222",
-        "5.43.225.228",
-        "5.43.229.28",
-        "5.43.225.23",
-        "185.8.58.9",
-        "185.8.58.246",
-        "185.8.58.243",
-        "185.8.58.244"
-        ]
-
-    withCredentials([
-       [$class          : 'UsernamePasswordMultiBinding',
-       credentialsId   : 'lab_engineer',
-       passwordVariable: 'lab_pass',
-       usernameVariable: 'lab_user']
-    ]) {
-        for (ip in bm_ips) { sh ("ipmitool -H ${ip} -U ${lab_user} -P ${lab_pass} chassis power off")}
-        for (ip in bm_ips) { sh ("ipmitool -H ${ip} -U ${lab_user} -P ${lab_pass} chassis bootdev pxe")}
-    }
-}
\ No newline at end of file
diff --git a/tcp_tests/templates/_heat_environments/eu-cloud-low-flavors.env b/tcp_tests/templates/_heat_environments/eu-cloud-low-flavors.env
new file mode 100644
index 0000000..f764165
--- /dev/null
+++ b/tcp_tests/templates/_heat_environments/eu-cloud-low-flavors.env
@@ -0,0 +1,48 @@
+
+resource_registry:
+  "MCP::MultipleInstance": fragments/MultipleInstance.yaml
+  "MCP::MultipleInstance2Volumes": fragments/MultipleInstance2Volumes.yaml
+  #"MCP::Flavors": fragments/Flavors.yaml
+  "MCP::MasterNode": fragments/MasterNode.yaml
+  "MCP::Compute": fragments/Compute.yaml
+  "MCP::Networks": fragments/Networks.yaml
+  "MCP::SingleInstance": fragments/Instance.yaml
+  "MCP::SingleInstance2Volumes": fragments/Instance2Volumes.yaml
+  "MCP::FoundationNode": fragments/FoundationNode.yaml
+  "MCP::FoundationNodeWithFloating": fragments/FoundationNodeWithFloating.yaml
+  "MCP::VsrxNode": fragments/VsrxNode.yaml
+  "MCP::Subnets": fragments/Subnets.yaml
+  "MCP::SubnetsWithFloating": fragments/SubnetsWithFloating.yaml
+
+parameter_defaults:
+
+  cfg_flavor: 8cpu16ram50stor0epf
+  ctl_flavor: 8cpu16ram50stor0epf
+  cid_flavor: 8cpu16ram50stor0epf
+  ntw_flavor: 8cpu16ram50stor0epf
+  nal_flavor: 8cpu16ram50stor0epf
+  dbs_flavor: 8cpu16ram50stor0epf
+  msg_flavor: 8cpu16ram50stor0epf
+  mon_flavor: 8cpu16ram50stor0epf
+  mdb_flavor: 8cpu16ram50stor0epf
+  log_flavor: 8cpu16ram50stor0epf
+  mtr_flavor: 8cpu16ram50stor0epf
+  cmp_flavor: 4cpu8ram100stor10epf
+  cmn_flavor: 4cpu8ram40stor0epf
+  rgw_flavor: 4cpu8ram40stor0epf
+  osd_flavor: 4cpu8ram40stor0epf
+  dns_flavor: 2cpu4ram30stor0epf
+  kmn_flavor: 4cpu8ram40stor0epf
+  prx_flavor: 4cpu8ram40stor0epf
+  gtw_flavor: 4cpu8ram40stor0epf
+  kvm_fake_flavor: 2cpu4ram30stor0epf
+  foundation_flavor: 4cpu8ram100stor10epf
+  vsrx_flavor: oc_vsrx
+
+  key_pair: system_key_8133
+  bm_availability_zone: nova
+  vm_availability_zone: nova
+  net_public: public
+
+  foundation_image: system.foundation01
+  nameservers: 172.18.176.6,172.18.224.6
diff --git a/tcp_tests/templates/_heat_environments/fragments/Instance2Volumes.yaml b/tcp_tests/templates/_heat_environments/fragments/Instance2Volumes.yaml
index 31fa18d..08612a9 100644
--- a/tcp_tests/templates/_heat_environments/fragments/Instance2Volumes.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/Instance2Volumes.yaml
@@ -90,14 +90,14 @@
     properties:
       volume_id: { get_resource: volume01 }
       instance_uuid: { get_resource: instance_instance }
-      mountpoint: /dev/vdd
+      mountpoint: /dev/vdc
   instance_volume02:
     type: OS::Cinder::VolumeAttachment
     depends_on: [ volume02, instance_volume01 ]
     properties:
       volume_id: { get_resource: volume02 }
       instance_uuid: { get_resource: instance_instance }
-      mountpoint: /dev/vde
+      mountpoint: /dev/vdd
 
   instance_instance:
     type: OS::Nova::Server
diff --git a/tcp_tests/templates/_heat_environments/us-cloud-low-flavors.env b/tcp_tests/templates/_heat_environments/us-cloud-low-flavors.env
new file mode 100644
index 0000000..f38ce92
--- /dev/null
+++ b/tcp_tests/templates/_heat_environments/us-cloud-low-flavors.env
@@ -0,0 +1,48 @@
+
+resource_registry:
+  "MCP::MultipleInstance": fragments/MultipleInstance.yaml
+  "MCP::MultipleInstance2Volumes": fragments/MultipleInstance2Volumes.yaml
+  #"MCP::Flavors": fragments/Flavors.yaml
+  "MCP::MasterNode": fragments/MasterNode.yaml
+  "MCP::Compute": fragments/Compute.yaml
+  "MCP::Networks": fragments/Networks.yaml
+  "MCP::SingleInstance": fragments/Instance.yaml
+  "MCP::SingleInstance2Volumes": fragments/Instance2Volumes.yaml
+  "MCP::FoundationNode": fragments/FoundationNode.yaml
+  "MCP::FoundationNodeWithFloating": fragments/FoundationNodeWithFloating.yaml
+  "MCP::VsrxNode": fragments/VsrxNode.yaml
+  "MCP::Subnets": fragments/Subnets.yaml
+  "MCP::SubnetsWithFloating": fragments/SubnetsWithFloating.yaml
+
+parameter_defaults:
+
+  cfg_flavor: 8cpu16ram50stor0epf
+  ctl_flavor: 8cpu16ram50stor0epf
+  cid_flavor: 8cpu16ram50stor0epf
+  ntw_flavor: 8cpu16ram50stor0epf
+  nal_flavor: 8cpu16ram50stor0epf
+  dbs_flavor: 8cpu16ram50stor0epf
+  msg_flavor: 8cpu16ram50stor0epf
+  mon_flavor: 8cpu16ram50stor0epf
+  mdb_flavor: 8cpu16ram50stor0epf
+  log_flavor: 8cpu16ram50stor0epf
+  mtr_flavor: 8cpu16ram50stor0epf
+  cmp_flavor: 4cpu8ram100stor10epf
+  cmn_flavor: 4cpu8ram40stor0epf
+  rgw_flavor: 4cpu8ram40stor0epf
+  osd_flavor: 4cpu8ram40stor0epf
+  dns_flavor: 2cpu4ram30stor0epf
+  kmn_flavor: 4cpu8ram40stor0epf
+  prx_flavor: 4cpu8ram40stor0epf
+  gtw_flavor: 4cpu8ram40stor0epf
+  kvm_fake_flavor: 2cpu4ram30stor0epf
+  foundation_flavor: 4cpu8ram100stor10epf
+  vsrx_flavor: oc_vsrx
+
+  key_pair: system-key-8133
+  bm_availability_zone: nova
+  vm_availability_zone: nova
+  net_public: public
+
+  foundation_image: system.foundation01
+  nameservers: 172.18.224.6,172.18.176.6
diff --git a/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt.yaml b/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt.yaml
index a31051f..f0b727e 100644
--- a/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt.yaml
+++ b/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt.yaml
@@ -5,6 +5,7 @@
 {% import 'shared-salt.yaml' as SHARED with context %}
 {% import 'shared-test-tools.yaml' as SHARED_TEST_TOOLS with context %}
 {% import 'shared-workarounds.yaml' as SHARED_WORKAROUNDS with context %}
+{% import 'shared-maas.yaml' as SHARED_MAAS with context %}
 
 - description: Wait for salt-master is ready after configdrive user-data
   cmd: |
@@ -14,6 +15,24 @@
   skip_fail: false
 
 {{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
+{{ SHARED_MAAS.REBOOT_HW_NODES('engineer', 'KBwdcRqwed3w2',
+  [
+      "185.8.59.227",
+      "185.8.59.229",
+      "5.43.225.88",
+      "5.43.225.112",
+      "5.43.225.208",
+      "5.43.227.118",
+      "185.8.58.248",
+      "185.8.59.222",
+      "5.43.225.228",
+      "5.43.229.28",
+      "5.43.225.23",
+      "185.8.58.9",
+      "185.8.58.246",
+      "185.8.58.243",
+      "185.8.58.244"
+  ]) }}
 
 {{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
 
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt.yaml
index 9fc0dfe..f008071 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt.yaml
@@ -5,6 +5,7 @@
 {% import 'shared-salt.yaml' as SHARED with context %}
 {% import 'shared-test-tools.yaml' as SHARED_TEST_TOOLS with context %}
 {% import 'shared-workarounds.yaml' as SHARED_WORKAROUNDS with context %}
+{% import 'shared-maas.yaml' as SHARED_MAAS with context %}
 
 - description: Wait for salt-master is ready after configdrive user-data
   cmd: |
@@ -14,6 +15,24 @@
   skip_fail: false
 
 {{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
+{{ SHARED_MAAS.REBOOT_HW_NODES('engineer', 'KBwdcRqwed3w2',
+  [
+      "185.8.59.227",
+      "185.8.59.229",
+      "5.43.225.88",
+      "5.43.225.112",
+      "5.43.225.208",
+      "5.43.227.118",
+      "185.8.58.248",
+      "185.8.59.222",
+      "5.43.225.228",
+      "5.43.229.28",
+      "5.43.225.23",
+      "185.8.58.9",
+      "185.8.58.246",
+      "185.8.58.243",
+      "185.8.58.244"
+  ]) }}
 
 {{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
 
diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt.yaml b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt.yaml
index 46393c3..d069df0 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt.yaml
@@ -7,6 +7,7 @@
 {% import 'shared-salt.yaml' as SHARED with context %}
 {% import 'shared-test-tools.yaml' as SHARED_TEST_TOOLS with context %}
 {% import 'shared-workarounds.yaml' as SHARED_WORKAROUNDS with context %}
+{% import 'shared-maas.yaml' as SHARED_MAAS with context %}
 
 - description: Wait for salt-master is ready after configdrive user-data
   cmd: |
@@ -16,6 +17,24 @@
   skip_fail: false
 
 {{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
+{{ SHARED_MAAS.REBOOT_HW_NODES('engineer', 'KBwdcRqwed3w2',
+  [
+      "185.8.59.227",
+      "185.8.59.229",
+      "5.43.225.88",
+      "5.43.225.112",
+      "5.43.225.208",
+      "5.43.227.118",
+      "185.8.58.248",
+      "185.8.59.222",
+      "5.43.225.228",
+      "5.43.229.28",
+      "5.43.225.23",
+      "185.8.58.9",
+      "185.8.58.246",
+      "185.8.58.243",
+      "185.8.58.244"
+  ]) }}
 
 {{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
 
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt.yaml b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt.yaml
index 8dbf61a..06b692c 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt.yaml
@@ -7,6 +7,7 @@
 {% import 'shared-salt.yaml' as SHARED with context %}
 {% import 'shared-test-tools.yaml' as SHARED_TEST_TOOLS with context %}
 {% import 'shared-workarounds.yaml' as SHARED_WORKAROUNDS with context %}
+{% import 'shared-maas.yaml' as SHARED_MAAS with context %}
 
 - description: Wait for salt-master is ready after configdrive user-data
   cmd: |
@@ -16,6 +17,24 @@
   skip_fail: false
 
 {{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
+{{ SHARED_MAAS.REBOOT_HW_NODES('engineer', 'KBwdcRqwed3w2',
+  [
+      "185.8.59.227",
+      "185.8.59.229",
+      "5.43.225.88",
+      "5.43.225.112",
+      "5.43.225.208",
+      "5.43.227.118",
+      "185.8.58.248",
+      "185.8.59.222",
+      "5.43.225.228",
+      "5.43.229.28",
+      "5.43.225.23",
+      "185.8.58.9",
+      "185.8.58.246",
+      "185.8.58.243",
+      "185.8.58.244"
+  ]) }}
 
 {{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
 
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index 554a306..8ad96c6 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -52,8 +52,8 @@
   ceph_osd_bond_mode: active-backup
   ceph_osd_data_partition_prefix: ""
   ceph_osd_count: '3'
-  ceph_osd_data_disks: "/dev/vdd"
-  ceph_osd_journal_or_block_db_disks: "/dev/vde"
+  ceph_osd_data_disks: "/dev/vdc"
+  ceph_osd_journal_or_block_db_disks: "/dev/vdd"
   ceph_osd_node_count: '3'
   ceph_osd_journal_size: '3'
   ceph_osd_deploy_nic: "eth0"
diff --git a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index a3b6311..63f0f22 100644
--- a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -270,7 +270,7 @@
   ceph_osd_storage_address_ranges: "==IPV4_NET_CONTROL_PREFIX==.201-==IPV4_NET_CONTROL_PREFIX==.203"
   ceph_osd_backend_address_ranges: "==IPV4_NET_TENANT_PREFIX==.201-==IPV4_NET_TENANT_PREFIX==.203"
 
-  ceph_osd_data_disks: "/dev/vdd"
+  ceph_osd_data_disks: "/dev/vdc"
   ceph_osd_journal_or_block_db_disks: ""
   ceph_osd_mode: "separated"
   ceph_osd_deploy_nic: "eth0"
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index 378fde9..4522bd7 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -59,8 +59,8 @@
   ceph_osd_data_partition_prefix: ""
   ceph_osd_bond_mode: active-backup
   ceph_osd_count: '3'
-  ceph_osd_data_disks: "/dev/vdd"
-  ceph_osd_journal_or_block_db_disks: "/dev/vde"
+  ceph_osd_data_disks: "/dev/vdc"
+  ceph_osd_journal_or_block_db_disks: "/dev/vdd"
   ceph_osd_mode: "separated"
   ceph_osd_node_count: '3'
   ceph_osd_journal_size: '3'
diff --git a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index 47e1c66..39eb138 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -275,7 +275,7 @@
   ceph_osd_storage_address_ranges: "==IPV4_NET_CONTROL_PREFIX==.201-==IPV4_NET_CONTROL_PREFIX==.203"
   ceph_osd_backend_address_ranges: "==IPV4_NET_TENANT_PREFIX==.201-==IPV4_NET_TENANT_PREFIX==.203"
 
-  ceph_osd_data_disks: "/dev/vdd"
+  ceph_osd_data_disks: "/dev/vdc"
   ceph_osd_journal_or_block_db_disks: ""
   ceph_osd_mode: "separated"
   ceph_osd_deploy_nic: "eth0"
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index e8afd72..c62c526 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -50,8 +50,8 @@
   ceph_osd_bond_mode: active-backup
   ceph_osd_data_partition_prefix: ""
   ceph_osd_count: '3'
-  ceph_osd_data_disks: "/dev/vdd"
-  ceph_osd_journal_or_block_db_disks: "/dev/vde"
+  ceph_osd_data_disks: "/dev/vdc"
+  ceph_osd_journal_or_block_db_disks: "/dev/vdd"
   ceph_osd_node_count: '3'
   ceph_osd_journal_size: '3'
   ceph_osd_deploy_nic: "eth0"
diff --git a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index b66aec1..5d791e8 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -264,8 +264,8 @@
   ceph_osd_storage_address_ranges: "==IPV4_NET_CONTROL_PREFIX==.201-==IPV4_NET_CONTROL_PREFIX==.203"
   ceph_osd_backend_address_ranges: "==IPV4_NET_TENANT_PREFIX==.201-==IPV4_NET_TENANT_PREFIX==.203"
 
-  ceph_osd_data_disks: "/dev/vdb"
-  ceph_osd_journal_or_block_db_disks: "/dev/vdb"
+  ceph_osd_data_disks: "/dev/vdc"
+  ceph_osd_journal_or_block_db_disks: "/dev/vdd"
   ceph_osd_mode: "separated"
   ceph_osd_deploy_nic: "eth0"
   ceph_osd_primary_first_nic: "eth1"
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index f382627..d14b2e9 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -60,8 +60,8 @@
   ceph_osd_data_partition_prefix: ""
   ceph_osd_bond_mode: active-backup
   ceph_osd_count: '3'
-  ceph_osd_data_disks: "/dev/vdd"
-  ceph_osd_journal_or_block_db_disks: "/dev/vde"
+  ceph_osd_data_disks: "/dev/vdc"
+  ceph_osd_journal_or_block_db_disks: "/dev/vdd"
   ceph_osd_mode: "separated"
   ceph_osd_node_count: '3'
   ceph_osd_journal_size: '3'
diff --git a/tcp_tests/templates/shared-maas.yaml b/tcp_tests/templates/shared-maas.yaml
index 0becf80..2066f4f 100644
--- a/tcp_tests/templates/shared-maas.yaml
+++ b/tcp_tests/templates/shared-maas.yaml
@@ -1,5 +1,23 @@
 {# Collection of common macroses shared across MaaS #}
 
+
+{%- macro REBOOT_HW_NODES(ipmi_user, ipmi_password, ipmi_devices=['']) %}
+
+- description: Reboot hardware computes and set to PXE boot. It needs for clean deployment
+  cmd: |
+    {%- for device in ipmi_devices %}
+      ipmitool -H {{ device }} -U {{ ipmi_user }} -P {{ ipmi_password }} chassis power off
+    {%- endfor %}
+    {%- for device in ipmi_devices %}
+      ipmitool -H {{ device }} -U {{ ipmi_user }} -P {{ ipmi_password }} chassis bootdev pxe
+    {%- endfor %}
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
+
+{%- endmacro %}
+
+
 {%- macro AUTH_IN_MAAS() %}
 
 - description: MaaS auth