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: