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 256e205..4daa262 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
@@ -203,7 +203,7 @@
         name: TEMPEST_EXTRA_ARGS
         trim: 'false'
     - bool:
-        default: false
+        default: true
         description: Whether to perform dist-upgrade on virtual nodes during deployment
         name: DIST_UPGRADE_NODES
     - bool:
diff --git a/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml b/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml
index 9ac21aa..003c801 100644
--- a/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml
+++ b/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml
@@ -202,7 +202,7 @@
         name: BATCH_SIZE
         trim: 'false'
     - bool:
-        default: false
+        default: true
         description: Whether to perform dist-upgrade on virtual nodes during deployment
         name: DIST_UPGRADE_NODES
     - bool:
diff --git a/jobs/templates/bm-b300-e7-cicd-pike-ovs-maas.yml b/jobs/templates/bm-b300-e7-cicd-pike-ovs-maas.yml
index 6aefe35..8176c38 100644
--- a/jobs/templates/bm-b300-e7-cicd-pike-ovs-maas.yml
+++ b/jobs/templates/bm-b300-e7-cicd-pike-ovs-maas.yml
@@ -194,7 +194,7 @@
         name: BATCH_SIZE
         trim: 'false'
     - bool:
-        default: false
+        default: true
         description: Whether to perform dist-upgrade on virtual nodes during deployment
         name: DIST_UPGRADE_NODES
     - bool:
diff --git a/jobs/templates/bm-cicd-queens-ovs-maas.yml b/jobs/templates/bm-cicd-queens-ovs-maas.yml
index f22dd6f..a6b27c0 100644
--- a/jobs/templates/bm-cicd-queens-ovs-maas.yml
+++ b/jobs/templates/bm-cicd-queens-ovs-maas.yml
@@ -208,7 +208,7 @@
         name: BATCH_SIZE
         trim: 'false'
     - bool:
-        default: false
+        default: true
         description: Whether to perform dist-upgrade on virtual nodes during deployment
         name: DIST_UPGRADE_NODES
     - bool:
diff --git a/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml b/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
index bf0d4f5..c2fe527 100644
--- a/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
+++ b/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
@@ -216,7 +216,7 @@
         name: BATCH_SIZE
         trim: 'false'
     - bool:
-        default: false
+        default: true
         description: Whether to perform dist-upgrade on virtual nodes during deployment
         name: DIST_UPGRADE_NODES
     - bool:
diff --git a/jobs/templates/heat-cicd-queens-dvr-sl.yml b/jobs/templates/heat-cicd-queens-dvr-sl.yml
index d3ca6c1..94b48bc 100644
--- a/jobs/templates/heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-queens-dvr-sl.yml
@@ -208,7 +208,7 @@
         name: TEMPEST_EXTRA_ARGS
         trim: 'false'
     - bool:
-        default: false
+        default: true
         description: Whether to perform dist-upgrade on virtual nodes during deployment
         name: DIST_UPGRADE_NODES
     - bool:
diff --git a/jobs/templates/released-bm-b300-cicd-queens-ovs-maas.yml b/jobs/templates/released-bm-b300-cicd-queens-ovs-maas.yml
index 14e180b..61c38c1 100644
--- a/jobs/templates/released-bm-b300-cicd-queens-ovs-maas.yml
+++ b/jobs/templates/released-bm-b300-cicd-queens-ovs-maas.yml
@@ -207,7 +207,7 @@
         name: BATCH_SIZE
         trim: 'false'
     - bool:
-        default: false
+        default: true
         description: Whether to perform dist-upgrade on virtual nodes during deployment
         name: DIST_UPGRADE_NODES
     - bool:
diff --git a/jobs/templates/released-bm-cicd-queens-ovs-cl-maas.yml b/jobs/templates/released-bm-cicd-queens-ovs-cl-maas.yml
index de00bee..e0c25b6 100644
--- a/jobs/templates/released-bm-cicd-queens-ovs-cl-maas.yml
+++ b/jobs/templates/released-bm-cicd-queens-ovs-cl-maas.yml
@@ -219,7 +219,7 @@
         name: BATCH_SIZE
         trim: 'false'
     - bool:
-        default: false
+        default: true
         description: Whether to perform dist-upgrade on virtual nodes during deployment
         name: DIST_UPGRADE_NODES
     - bool:
diff --git a/jobs/templates/released-bm-pike-ovs.yml b/jobs/templates/released-bm-pike-ovs.yml
index 5a2dbc7..843ff49 100644
--- a/jobs/templates/released-bm-pike-ovs.yml
+++ b/jobs/templates/released-bm-pike-ovs.yml
@@ -182,7 +182,7 @@
         name: BATCH_SIZE
         trim: 'false'
     - bool:
-        default: false
+        default: true
         description: Whether to perform dist-upgrade on virtual nodes during deployment
         name: DIST_UPGRADE_NODES
     - bool:
diff --git a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
index ab42279..377f75e 100644
--- a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
@@ -207,7 +207,7 @@
             Overwrite subsection of updates.mirantis.com repository.
             Effective only if enabled in cookiecutter context!
     - bool:
-        default: false
+        default: true
         description: Whether to perform dist-upgrade on virtual nodes during deployment
         name: DIST_UPGRADE_NODES
     - bool:
diff --git a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
index adc13f2..3ec8fc2 100644
--- a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
@@ -210,7 +210,7 @@
         name: TEMPEST_PATTERN
         trim: 'false'
     - bool:
-        default: false
+        default: true
         description: Whether to perform dist-upgrade on virtual nodes during deployment
         name: DIST_UPGRADE_NODES
     - bool:
diff --git a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
index 6330c69..126296c 100644
--- a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
@@ -207,7 +207,7 @@
             Overwrite subsection of updates.mirantis.com repository.
             Effective only if enabled in cookiecutter context!
     - bool:
-        default: false
+        default: true
         description: Whether to perform dist-upgrade on virtual nodes during deployment
         name: DIST_UPGRADE_NODES
     - bool:
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 3c24fde..2964c63 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
@@ -317,6 +317,6 @@
     change_password_upon_first_use: False
 
   # Enable Mirantis repo with CVE fixes for xenial
-  updates_mirantis_login: "%LOGIN%"
-  updates_mirantis_password: "%PASS%"
-  updates_mirantis_version: "stable"
\ No newline at end of file
+  #updates_mirantis_login: "%LOGIN%"
+  #updates_mirantis_password: "%PASS%"
+  #updates_mirantis_version: "stable"
\ No newline at end of file
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 4ef5126..1cec515 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
@@ -358,6 +358,6 @@
   maas_manage_deploy_network: 'True'
 
   # Enable Mirantis repo with CVE fixes for xenial
-  updates_mirantis_login: "%LOGIN%"
-  updates_mirantis_password: "%PASS%"
-  updates_mirantis_version: "stable"
\ No newline at end of file
+  #updates_mirantis_login: "%LOGIN%"
+  #updates_mirantis_password: "%PASS%"
+  #updates_mirantis_version: "stable"
\ No newline at end of file
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 d4f5fce..cee31e7 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
@@ -306,6 +306,6 @@
     change_password_upon_first_use: False
 
   # Enable Mirantis repo with CVE fixes for xenial
-  updates_mirantis_login: "%LOGIN%"
-  updates_mirantis_password: "%PASS%"
-  updates_mirantis_version: "stable"
\ No newline at end of file
+  #updates_mirantis_login: "%LOGIN%"
+  #updates_mirantis_password: "%PASS%"
+  #updates_mirantis_version: "stable"
\ No newline at end of file
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 6f7b8d8..a98d2cc 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
@@ -380,6 +380,6 @@
 
   stacklight_ssl_enabled: 'True'
   # Enable Mirantis repo with CVE fixes for xenial
-  updates_mirantis_login: "%LOGIN%"
-  updates_mirantis_password: "%PASS%"
-  updates_mirantis_version: "stable"
\ No newline at end of file
+  #updates_mirantis_login: "%LOGIN%"
+  #updates_mirantis_password: "%PASS%"
+  #updates_mirantis_version: "stable"
\ No newline at end of file