diff --git a/playbooks/roles/zuul-scheduler/tasks/main.yaml b/playbooks/roles/zuul-scheduler/tasks/main.yaml
index becbcff55f..c627e911b1 100644
--- a/playbooks/roles/zuul-scheduler/tasks/main.yaml
+++ b/playbooks/roles/zuul-scheduler/tasks/main.yaml
@@ -40,12 +40,14 @@
     name: logrotate
   vars:
     logrotate_file_name: /var/log/zuul/zuul.log
+    logrotate_rotate: 30
 
 - name: Rotate zuul debug logs
   include_role:
     name: logrotate
   vars:
-    logrotate_file_name: /var/log/zuul/zuul-debug.log
+    logrotate_file_name: /var/log/zuul/debug.log
+    logrotate_rotate: 30
 
 - name: Rotate gearman logs
   include_role:
diff --git a/playbooks/roles/zuul-web/tasks/main.yaml b/playbooks/roles/zuul-web/tasks/main.yaml
index 7572a8eced..9b393926f7 100644
--- a/playbooks/roles/zuul-web/tasks/main.yaml
+++ b/playbooks/roles/zuul-web/tasks/main.yaml
@@ -71,24 +71,28 @@
     name: logrotate
   vars:
     logrotate_file_name: /var/log/zuul/web.log
+    logrotate_rotate: 30
 
 - name: Rotate web debug logs
   include_role:
     name: logrotate
   vars:
     logrotate_file_name: /var/log/zuul/web-debug.log
+    logrotate_rotate: 30
 
 - name: Rotate fingergw logs
   include_role:
     name: logrotate
   vars:
     logrotate_file_name: /var/log/zuul/fingergw.log
+    logrotate_rotate: 30
 
 - name: Rotate fingergw debug logs
   include_role:
     name: logrotate
   vars:
     logrotate_file_name: /var/log/zuul/fingergw-debug.log
+    logrotate_rotate: 30
 
 - name: Make docker-compose directory
   file:
diff --git a/playbooks/roles/zuul/tasks/main.yaml b/playbooks/roles/zuul/tasks/main.yaml
index 1451caff02..be14691195 100644
--- a/playbooks/roles/zuul/tasks/main.yaml
+++ b/playbooks/roles/zuul/tasks/main.yaml
@@ -97,6 +97,7 @@
     - /var/run/zuul
     - /var/lib/zuul
     - /var/lib/zuul/ssh
+    - /var/lib/zuul/backup
 
 - name: Write Zuul SSH Key
   copy: