diff --git a/tcp_tests/templates/cookied-model-generator/salt_bm-b300-cicd-queens-ovs-maas.yaml b/tcp_tests/templates/cookied-model-generator/salt_bm-b300-cicd-queens-ovs-maas.yaml
index 73b5ad6..29d3667 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_bm-b300-cicd-queens-ovs-maas.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_bm-b300-cicd-queens-ovs-maas.yaml
@@ -70,3 +70,13 @@
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
+
+- description: "Maas disk_erase_with_secure_erase set false"
+  cmd: |
+    set -e;
+    set -x;
+    . /root/venv-reclass-tools/bin/activate;
+    reclass-tools add-bool-key parameters.maas.region.maas_config.disk_erase_with_secure_erase false /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
diff --git a/tcp_tests/templates/cookied-model-generator/salt_bm-b300-e7-cicd-pike-ovs-maas.yaml b/tcp_tests/templates/cookied-model-generator/salt_bm-b300-e7-cicd-pike-ovs-maas.yaml
old mode 100755
new mode 100644
index 11ce67b..2f30779
--- a/tcp_tests/templates/cookied-model-generator/salt_bm-b300-e7-cicd-pike-ovs-maas.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_bm-b300-e7-cicd-pike-ovs-maas.yaml
@@ -60,3 +60,13 @@
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
+
+- description: "Maas disk_erase_with_secure_erase set false"
+  cmd: |
+    set -e;
+    set -x;
+    . /root/venv-reclass-tools/bin/activate;
+    reclass-tools add-bool-key parameters.maas.region.maas_config.disk_erase_with_secure_erase false /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
diff --git a/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-pike-ovs-maas.yaml b/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-pike-ovs-maas.yaml
index ba710e8..fc14ebb 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-pike-ovs-maas.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-pike-ovs-maas.yaml
@@ -59,4 +59,14 @@
     reclass-tools add-key parameters._param.power_password {{ IPMI_PASS }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
+  skip_fail: false
+
+- description: "Maas disk_erase_with_secure_erase set false"
+  cmd: |
+    set -e;
+    set -x;
+    . /root/venv-reclass-tools/bin/activate;
+    reclass-tools add-bool-key parameters.maas.region.maas_config.disk_erase_with_secure_erase false /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
   skip_fail: false
\ No newline at end of file
diff --git a/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-queens-ovs-cl-maas.yaml b/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-queens-ovs-cl-maas.yaml
old mode 100755
new mode 100644
index 8c6f595..5e1453c
--- a/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-queens-ovs-cl-maas.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-queens-ovs-cl-maas.yaml
@@ -70,3 +70,13 @@
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
+
+- description: "Maas disk_erase_with_secure_erase set false"
+  cmd: |
+    set -e;
+    set -x;
+    . /root/venv-reclass-tools/bin/activate;
+    reclass-tools add-bool-key parameters.maas.region.maas_config.disk_erase_with_secure_erase false /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
diff --git a/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-queens-ovs-maas.yaml b/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-queens-ovs-maas.yaml
index 65d1d18..3822a9d 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-queens-ovs-maas.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-queens-ovs-maas.yaml
@@ -70,3 +70,13 @@
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
+
+- description: "Maas disk_erase_with_secure_erase set false"
+  cmd: |
+    set -e;
+    set -x;
+    . /root/venv-reclass-tools/bin/activate;
+    reclass-tools add-bool-key parameters.maas.region.maas_config.disk_erase_with_secure_erase false /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
diff --git a/tcp_tests/templates/cookied-model-generator/salt_heat-bm-cicd-pike-contrail-sl.yaml b/tcp_tests/templates/cookied-model-generator/salt_heat-bm-cicd-pike-contrail-sl.yaml
index 04d9f4a..fc53877 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_heat-bm-cicd-pike-contrail-sl.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_heat-bm-cicd-pike-contrail-sl.yaml
@@ -54,4 +54,14 @@
     reclass-tools add-key parameters._param.power_password {{ IPMI_PASS }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
-  skip_fail: false
\ No newline at end of file
+  skip_fail: false
+
+- description: "Maas disk_erase_with_secure_erase set false"
+  cmd: |
+    set -e;
+    set -x;
+    . /root/venv-reclass-tools/bin/activate;
+    reclass-tools add-bool-key parameters.maas.region.maas_config.disk_erase_with_secure_erase false /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
diff --git a/tcp_tests/templates/cookied-model-generator/salt_heat-bm-cicd-queens-contrail-sl.yaml b/tcp_tests/templates/cookied-model-generator/salt_heat-bm-cicd-queens-contrail-sl.yaml
index c8a6cc5..7e47516 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_heat-bm-cicd-queens-contrail-sl.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_heat-bm-cicd-queens-contrail-sl.yaml
@@ -62,4 +62,4 @@
     reclass-tools add-bool-key parameters.maas.region.maas_config.disk_erase_with_secure_erase false /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
-  skip_fail: false
\ No newline at end of file
+  skip_fail: false
diff --git a/tcp_tests/templates/cookied-model-generator/salt_heat-cicd-pike-contrail-stb-sl.yaml b/tcp_tests/templates/cookied-model-generator/salt_heat-cicd-pike-contrail-stb-sl.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/cookied-model-generator/salt_released-bm-b300-cicd-queens-ovs-maas.yaml b/tcp_tests/templates/cookied-model-generator/salt_released-bm-b300-cicd-queens-ovs-maas.yaml
index c0292a4..ec8fd00 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_released-bm-b300-cicd-queens-ovs-maas.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_released-bm-b300-cicd-queens-ovs-maas.yaml
@@ -76,3 +76,13 @@
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 1}
   skip_fail: false
+
+- description: "Maas disk_erase_with_secure_erase set false"
+  cmd: |
+    set -e;
+    set -x;
+    . /root/venv-reclass-tools/bin/activate;
+    reclass-tools add-bool-key parameters.maas.region.maas_config.disk_erase_with_secure_erase false /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
diff --git a/tcp_tests/templates/cookied-model-generator/salt_released-bm-cicd-queens-ovs-cl-maas.yaml b/tcp_tests/templates/cookied-model-generator/salt_released-bm-cicd-queens-ovs-cl-maas.yaml
index 7ca8b13..daaaecc 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_released-bm-cicd-queens-ovs-cl-maas.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_released-bm-cicd-queens-ovs-cl-maas.yaml
@@ -70,3 +70,13 @@
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
+
+- description: "Maas disk_erase_with_secure_erase set false"
+  cmd: |
+    set -e;
+    set -x;
+    . /root/venv-reclass-tools/bin/activate;
+    reclass-tools add-bool-key parameters.maas.region.maas_config.disk_erase_with_secure_erase false /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas.yml;
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false