diff --git a/jobs/templates/test-scenarios.yml b/jobs/templates/test-scenarios.yml
index 1d26ca0..e8c5fb8 100644
--- a/jobs/templates/test-scenarios.yml
+++ b/jobs/templates/test-scenarios.yml
@@ -93,9 +93,8 @@
 
     jobs:
       - '{test_scenario}'
-    build-discarder:
-      days-to-keep: 365
-      artifact-days-to-keep: 60
+    logrotate:
+      daysToKeep: 365
 
 - job-group:
     name: 'ceph-tests'
@@ -118,9 +117,8 @@
           display-name: Failover tests for Ceph nodes
     jobs:
       - '{test_scenario}'
-    build-discarder:
-      days-to-keep: 365
-      artifact-days-to-keep: 60
+    logrotate:
+      daysToKeep: 365
 
 - job-group:
     name: 'update-tests'
@@ -206,9 +204,8 @@
 
     jobs:
       - '{test_scenario}'
-    build-discarder:
-      days-to-keep: 365
-      artifact-days-to-keep: 60
+    logrotate:
+      daysToKeep: 365
 
 ###################### JOB TEMPLATE ###################
 - job-template:
@@ -220,11 +217,11 @@
     disabled: '{disabled|false}'
     quiet-period: 2
     node: 'openstack_slave_{deployment}'
-    build-discarder:
-      days-to-keep: 365
-      artifact-days-to-keep: 60
-      num-to-keep: 60
-      artifact-num-to-keep: 60
+    logrotate:
+      daysToKeep: 365
+      numToKeep: 60
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
     # Requires the Jenkins BuildResultTrigger Plugin
     triggers:
       - build-result: