diff --git a/jobs/pipelines/deploy-cicd-and-run-tests.groovy b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
index 07684cf..1e35c9e 100644
--- a/jobs/pipelines/deploy-cicd-and-run-tests.groovy
+++ b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
@@ -1,3 +1,7 @@
+/*
+*   DEPLOY_EMPTY_NODE             Add extra node to heat stack. Node without a role and with salt-minion
+*/
+
 @Library('tcp-qa')_
 
 def common = new com.mirantis.mk.Common()
diff --git a/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy b/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy
index ba52899..7ae510e 100644
--- a/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy
+++ b/jobs/pipelines/swarm-bootstrap-salt-cluster-heat.groovy
@@ -30,6 +30,7 @@
  *   JENKINS_PIPELINE_BRANCH       Should be set in release/proposed/2019.2.0 when we test non-released version
  *   UPDATE_VERSION                Version of update to deploy
  *   LAB_PARAM_DEFAULTS            Filename placed in tcp_tests/templates/_heat_environments, with default parameters for the heat template
+ *   DEPLOY_EMPTY_NODE             Add extra node to heat stack. Node without a role and with salt-minion
  *
  *   CREATE_JENKINS_NODE_CREDENTIALS   Jenkins username and password with rights to add/delete Jenkins agents
  */
@@ -162,6 +163,7 @@
                             export ENV_NAME=${ENV_NAME}
                             export LAB_CONFIG_NAME=${LAB_CONFIG_NAME}
                             export LAB_PARAM_DEFAULTS=${LAB_PARAM_DEFAULTS}
+                            export DEPLOY_EMPTY_NODE=${DEPLOY_EMPTY_NODE}
                             export LOG_NAME=swarm_test_create_environment.log
                             py.test --cache-clear -vvv -s -p no:django -p no:ipdb --junit-xml=deploy_hardware.xml -k \${TEST_GROUP}
                         """)
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 4a8ebfd..fbd3355 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
@@ -105,6 +105,10 @@
         default: true
         description: ''
         name: SHUTDOWN_ENV_ON_TEARDOWN
+    - bool:
+        default: false
+        description: 'Add extra node to heat stack. Node without a role and with salt-minion'
+        name: DEPLOY_EMPTY_NODE
     - string:
         default: ''
         description: ''
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 4da28d4..26c84d9 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
@@ -65,6 +65,10 @@
         description: ''
         name: ENV_NAME
         trim: 'false'
+    - bool:
+        default: false
+        description: 'Add extra node to heat stack. Node without a role and with salt-minion'
+        name: DEPLOY_EMPTY_NODE
     - string:
         default: ''
         description: |-
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 2374cb4..91895e8 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
@@ -65,6 +65,10 @@
         description: ''
         name: ENV_NAME
         trim: 'false'
+    - bool:
+        default: false
+        description: 'Add extra node to heat stack. Node without a role and with salt-minion'
+        name: DEPLOY_EMPTY_NODE
     - string:
         default: ''
         description: |-
diff --git a/jobs/templates/heat-cicd-pike-dvr-sl.yml b/jobs/templates/heat-cicd-pike-dvr-sl.yml
index f3baf7e..5128bd5 100644
--- a/jobs/templates/heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-pike-dvr-sl.yml
@@ -70,6 +70,10 @@
         description: ''
         name: ENV_NAME
         trim: 'false'
+    - bool:
+        default: false
+        description: 'Add extra node to heat stack. Node without a role and with salt-minion'
+        name: DEPLOY_EMPTY_NODE
     - string:
         default: ''
         description: |-
diff --git a/jobs/templates/heat-cicd-queens-contrail41-sl.yml b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
index 71f1f6a..029c090 100644
--- a/jobs/templates/heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
@@ -65,6 +65,10 @@
         description: ''
         name: ENV_NAME
         trim: 'false'
+    - bool:
+        default: false
+        description: 'Add extra node to heat stack. Node without a role and with salt-minion'
+        name: DEPLOY_EMPTY_NODE
     - string:
         default: ''
         description: |-
diff --git a/jobs/templates/heat-cicd-queens-dvr-sl.yml b/jobs/templates/heat-cicd-queens-dvr-sl.yml
index b0afc13..d3bb4c6 100644
--- a/jobs/templates/heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-queens-dvr-sl.yml
@@ -64,6 +64,10 @@
         description: ''
         name: ENV_NAME
         trim: 'false'
+    - bool:
+        default: true
+        description: 'Add extra node to heat stack. Node without a role and with salt-minion'
+        name: DEPLOY_EMPTY_NODE
     - string:
         default: ''
         description: |-
diff --git a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
index 9d87587..7789c7d 100644
--- a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
@@ -62,6 +62,10 @@
         description: ''
         name: ENV_NAME
         trim: 'false'
+    - bool:
+        default: false
+        description: 'Add extra node to heat stack. Node without a role and with salt-minion'
+        name: DEPLOY_EMPTY_NODE
     - string:
         default: ''
         description: |-
diff --git a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
index 8b0c773..be08433 100644
--- a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
@@ -62,6 +62,10 @@
         description: ''
         name: ENV_NAME
         trim: 'false'
+    - bool:
+        default: false
+        description: 'Add extra node to heat stack. Node without a role and with salt-minion'
+        name: DEPLOY_EMPTY_NODE
     - string:
         default: ''
         description: |-
diff --git a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
index 983fb11..60a4372 100644
--- a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
@@ -62,6 +62,10 @@
         description: ''
         name: ENV_NAME
         trim: 'false'
+    - bool:
+        default: false
+        description: 'Add extra node to heat stack. Node without a role and with salt-minion'
+        name: DEPLOY_EMPTY_NODE
     - string:
         default: ''
         description: |-
diff --git a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
index f263ac3..0c0cb08 100644
--- a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
@@ -62,6 +62,10 @@
         description: ''
         name: ENV_NAME
         trim: 'false'
+    - bool:
+        default: false
+        description: 'Add extra node to heat stack. Node without a role and with salt-minion'
+        name: DEPLOY_EMPTY_NODE
     - string:
         default: ''
         description: |-