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 aac7ab4..8e6c353 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
@@ -214,5 +214,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
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 3e3f631..a5717ad 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
@@ -219,6 +219,7 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
 
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 5e575af..6eeb8a8 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
@@ -219,5 +219,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml b/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml
index e64a02c..f58de1c 100644
--- a/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml
+++ b/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml
@@ -218,5 +218,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/bm-cicd-pike-ovs-maas.yml b/jobs/templates/bm-cicd-pike-ovs-maas.yml
index a3b6e4a..5092db1 100644
--- a/jobs/templates/bm-cicd-pike-ovs-maas.yml
+++ b/jobs/templates/bm-cicd-pike-ovs-maas.yml
@@ -205,6 +205,7 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
 
diff --git a/jobs/templates/bm-cicd-queens-ovs-maas.yml b/jobs/templates/bm-cicd-queens-ovs-maas.yml
index 73b9196..61384af 100644
--- a/jobs/templates/bm-cicd-queens-ovs-maas.yml
+++ b/jobs/templates/bm-cicd-queens-ovs-maas.yml
@@ -218,5 +218,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/bm-e7-cicd-pike-odl-maas.yml b/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
index 26e463e..7507fa1 100644
--- a/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
+++ b/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
@@ -215,6 +215,7 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
 
diff --git a/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml b/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
index 131f7e3..25b7560 100644
--- a/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
+++ b/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
@@ -210,6 +210,7 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
 
diff --git a/jobs/templates/cleanup-jenkins-agents.yml b/jobs/templates/cleanup-jenkins-agents.yml
index 859463c..46039b5 100644
--- a/jobs/templates/cleanup-jenkins-agents.yml
+++ b/jobs/templates/cleanup-jenkins-agents.yml
@@ -14,5 +14,6 @@
           - master
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/remove-old-jenkins-agents.groovy
-    logrotate:
-      daysToKeep: 365
\ No newline at end of file
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
\ No newline at end of file
diff --git a/jobs/templates/deploy-released.yml b/jobs/templates/deploy-released.yml
index 126b5e0..714d29e 100644
--- a/jobs/templates/deploy-released.yml
+++ b/jobs/templates/deploy-released.yml
@@ -58,5 +58,6 @@
           clean:
             before: true
       script-path: jobs/pipelines/rotation-released-deployment.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/deploy_bm.yml b/jobs/templates/deploy_bm.yml
index 0e3c102..eaa6b04 100644
--- a/jobs/templates/deploy_bm.yml
+++ b/jobs/templates/deploy_bm.yml
@@ -52,6 +52,7 @@
             refspec: ${{TCP_QA_REFS}}
             url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/rotation_bm_deployments.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
 
diff --git a/jobs/templates/download-config-drive.yml b/jobs/templates/download-config-drive.yml
index 74bd001..94269ec 100644
--- a/jobs/templates/download-config-drive.yml
+++ b/jobs/templates/download-config-drive.yml
@@ -105,8 +105,9 @@
 
       }}
     name: download-config-drive
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
     parameters:
     - string:
         default: ''
diff --git a/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml b/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml
index 576936f..d8f618b 100644
--- a/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml
+++ b/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml
@@ -231,5 +231,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml b/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
index 313f9c6..a06d317 100644
--- a/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
+++ b/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
@@ -232,5 +232,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/heat-cicd-pike-dvr-sl.yml b/jobs/templates/heat-cicd-pike-dvr-sl.yml
index 2ade702..7f48f08 100644
--- a/jobs/templates/heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-pike-dvr-sl.yml
@@ -10,7 +10,7 @@
     - timed: '{obj:trigger_time}'
     properties:
     - build-discarder:
-        days-to-keep: 60
+        days-to-keep: 365
         num-to-keep: 50
     parameters:
     - string:
@@ -221,5 +221,6 @@
           clean:
             before: true
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/heat-cicd-queens-contrail41-sl.yml b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
index 2eca95b..248fdbe 100644
--- a/jobs/templates/heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
@@ -217,6 +217,7 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
 
diff --git a/jobs/templates/heat-cicd-queens-dvr-sl.yml b/jobs/templates/heat-cicd-queens-dvr-sl.yml
index bcaaa84..1cdacfa 100644
--- a/jobs/templates/heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-queens-dvr-sl.yml
@@ -218,6 +218,7 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
 
diff --git a/jobs/templates/release-artifact-checker.yml b/jobs/templates/release-artifact-checker.yml
index b1c9c29..1b9cd07 100644
--- a/jobs/templates/release-artifact-checker.yml
+++ b/jobs/templates/release-artifact-checker.yml
@@ -9,5 +9,6 @@
     builders:
     - shell:
         "python3 jobs/scripts/mcp_mu_release_artifact_checker.py"
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
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 7fd05f8..751804b 100644
--- a/jobs/templates/released-bm-b300-cicd-queens-ovs-maas.yml
+++ b/jobs/templates/released-bm-b300-cicd-queens-ovs-maas.yml
@@ -227,5 +227,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/released-bm-pike-ovs.yml b/jobs/templates/released-bm-pike-ovs.yml
index ceb8563..3ef04da 100644
--- a/jobs/templates/released-bm-pike-ovs.yml
+++ b/jobs/templates/released-bm-pike-ovs.yml
@@ -198,5 +198,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
index 37aadc0..a8922d8 100644
--- a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
@@ -230,5 +230,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
index 0ea7e7b..398a114 100644
--- a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
@@ -230,5 +230,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
index 91f5f18..4dfd557 100644
--- a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
@@ -233,5 +233,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
index 1740a26..eb93df6 100644
--- a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
@@ -230,5 +230,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/deploy-cicd-and-run-tests.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/self-deploy-jobs.yaml b/jobs/templates/self-deploy-jobs.yaml
index 64f1ec4..6bea711 100644
--- a/jobs/templates/self-deploy-jobs.yaml
+++ b/jobs/templates/self-deploy-jobs.yaml
@@ -24,5 +24,6 @@
           refspec: '${{TCP_QA_REFS}}'
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
       script-path: jobs/pipelines/self-deploy-jobs.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/self-deploy-virtulenvs.yaml b/jobs/templates/self-deploy-virtulenvs.yaml
index 75f6027..8cc4d47 100644
--- a/jobs/templates/self-deploy-virtulenvs.yaml
+++ b/jobs/templates/self-deploy-virtulenvs.yaml
@@ -20,7 +20,8 @@
     builders:
       - shell: "chmod +x tcp_tests/templates/_packer/scripts/jenkins_virtualenvs.sh"
       - shell: "export CHANGE_RIGHTS=false ; ./tcp_tests/templates/_packer/scripts/jenkins_virtualenvs.sh"
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
 
 
diff --git a/jobs/templates/swarm-deploy-cicd.yml b/jobs/templates/swarm-deploy-cicd.yml
index 5d24db3..217c6bf 100644
--- a/jobs/templates/swarm-deploy-cicd.yml
+++ b/jobs/templates/swarm-deploy-cicd.yml
@@ -69,5 +69,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/swarm-deploy-cicd.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/swarm-deploy-platform.yml b/jobs/templates/swarm-deploy-platform.yml
index f6a2270..dbcaae5 100644
--- a/jobs/templates/swarm-deploy-platform.yml
+++ b/jobs/templates/swarm-deploy-platform.yml
@@ -70,5 +70,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/swarm-deploy-platform.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/swarm-run-pytest.yml b/jobs/templates/swarm-run-pytest.yml
index e06b3ef..a511794 100644
--- a/jobs/templates/swarm-run-pytest.yml
+++ b/jobs/templates/swarm-run-pytest.yml
@@ -89,5 +89,6 @@
           refspec: ${{TCP_QA_REFS}}
           url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa.git
       script-path: jobs/pipelines/swarm-run-pytest.groovy
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
diff --git a/jobs/templates/test-scenarios.yml b/jobs/templates/test-scenarios.yml
index e8c5fb8..1d26ca0 100644
--- a/jobs/templates/test-scenarios.yml
+++ b/jobs/templates/test-scenarios.yml
@@ -93,8 +93,9 @@
 
     jobs:
       - '{test_scenario}'
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
 
 - job-group:
     name: 'ceph-tests'
@@ -117,8 +118,9 @@
           display-name: Failover tests for Ceph nodes
     jobs:
       - '{test_scenario}'
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
 
 - job-group:
     name: 'update-tests'
@@ -204,8 +206,9 @@
 
     jobs:
       - '{test_scenario}'
-    logrotate:
-      daysToKeep: 365
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
 
 ###################### JOB TEMPLATE ###################
 - job-template:
@@ -217,11 +220,11 @@
     disabled: '{disabled|false}'
     quiet-period: 2
     node: 'openstack_slave_{deployment}'
-    logrotate:
-      daysToKeep: 365
-      numToKeep: 60
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
+    build-discarder:
+      days-to-keep: 365
+      artifact-days-to-keep: 60
+      num-to-keep: 60
+      artifact-num-to-keep: 60
     # Requires the Jenkins BuildResultTrigger Plugin
     triggers:
       - build-result: