diff --git a/modules/openstack_project/files/zuul/gearman-logging.conf b/modules/openstack_project/files/zuul/gearman-logging.conf
index 4af3703acc..6ca75b7f16 100644
--- a/modules/openstack_project/files/zuul/gearman-logging.conf
+++ b/modules/openstack_project/files/zuul/gearman-logging.conf
@@ -24,9 +24,9 @@ args=(sys.stdout,)
 
 [handler_normal]
 level=INFO
-class=logging.handlers.TimedRotatingFileHandler
+class=logging.handlers.FileHandler
 formatter=simple
-args=('/var/log/zuul/gearman-server.log', 'midnight', 1, 3,)
+args=('/var/log/zuul/gearman-server.log')
 
 [formatter_simple]
 format=%(asctime)s %(levelname)s %(name)s: %(message)s
diff --git a/modules/openstack_project/files/zuul/logging.conf b/modules/openstack_project/files/zuul/logging.conf
index ec369851d7..162f03695b 100644
--- a/modules/openstack_project/files/zuul/logging.conf
+++ b/modules/openstack_project/files/zuul/logging.conf
@@ -34,15 +34,15 @@ args=(sys.stdout,)
 
 [handler_debug]
 level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
+class=logging.handlers.FileHandler
 formatter=simple
-args=('/var/log/zuul/debug.log', 'midnight', 1, 30,)
+args=('/var/log/zuul/debug.log')
 
 [handler_normal]
 level=INFO
-class=logging.handlers.TimedRotatingFileHandler
+class=logging.handlers.FileHandler
 formatter=simple
-args=('/var/log/zuul/zuul.log', 'midnight', 1, 30,)
+args=('/var/log/zuul/zuul.log')
 
 [formatter_simple]
 format=%(asctime)s %(levelname)s %(name)s: %(message)s
diff --git a/modules/openstack_project/files/zuul/merger-logging.conf b/modules/openstack_project/files/zuul/merger-logging.conf
index fb275675ee..ecfebd617c 100644
--- a/modules/openstack_project/files/zuul/merger-logging.conf
+++ b/modules/openstack_project/files/zuul/merger-logging.conf
@@ -34,15 +34,15 @@ args=(sys.stdout,)
 
 [handler_debug]
 level=DEBUG
-class=logging.handlers.TimedRotatingFileHandler
+class=logging.handlers.FileHandler
 formatter=simple
-args=('/var/log/zuul/merger-debug.log', 'midnight', 1, 30,)
+args=('/var/log/zuul/merger-debug.log')
 
 [handler_normal]
 level=INFO
-class=logging.handlers.TimedRotatingFileHandler
+class=logging.handlers.FileHandler
 formatter=simple
-args=('/var/log/zuul/merger.log', 'midnight', 1, 30,)
+args=('/var/log/zuul/merger.log')
 
 [formatter_simple]
 format=%(asctime)s %(levelname)s %(name)s: %(message)s
diff --git a/modules/zuul/manifests/merger.pp b/modules/zuul/manifests/merger.pp
index abda6acb34..7aeb0384c2 100644
--- a/modules/zuul/manifests/merger.pp
+++ b/modules/zuul/manifests/merger.pp
@@ -33,4 +33,30 @@ class zuul::merger (
     require     => [User['zuul'],
                     File['/var/lib/zuul/git']],
   }
+
+  include logrotate
+  logrotate::file { 'merger.log':
+    log     => '/var/log/zuul/merger.log',
+    options => [
+      'compress',
+      'copytruncate',
+      'missingok',
+      'rotate 30',
+      'daily',
+      'notifempty',
+    ],
+    require => Service['zuul-merger'],
+  }
+  logrotate::file { 'merger-debug.log':
+    log     => '/var/log/zuul/merger-debug.log',
+    options => [
+      'compress',
+      'copytruncate',
+      'missingok',
+      'rotate 30',
+      'daily',
+      'notifempty',
+    ],
+    require => Service['zuul-merger'],
+  }
 }
diff --git a/modules/zuul/manifests/server.pp b/modules/zuul/manifests/server.pp
index 4e06c3054e..261aa73e20 100644
--- a/modules/zuul/manifests/server.pp
+++ b/modules/zuul/manifests/server.pp
@@ -29,4 +29,42 @@ class zuul::server (
     require     => File['/etc/init.d/zuul'],
     refreshonly => true,
   }
+
+  include logrotate
+  logrotate::file { 'zuul.log':
+    log     => '/var/log/zuul/zuul.log',
+    options => [
+      'compress',
+      'copytruncate',
+      'missingok',
+      'rotate 30',
+      'daily',
+      'notifempty',
+    ],
+    require => Service['zuul'],
+  }
+  logrotate::file { 'zuul-debug.log':
+    log     => '/var/log/zuul/debug.log',
+    options => [
+      'compress',
+      'copytruncate',
+      'missingok',
+      'rotate 30',
+      'daily',
+      'notifempty',
+    ],
+    require => Service['zuul'],
+  }
+  logrotate::file { 'gearman-server.log':
+    log     => '/var/log/zuul/gearman-server.log',
+    options => [
+      'compress',
+      'copytruncate',
+      'missingok',
+      'rotate 7',
+      'daily',
+      'notifempty',
+    ],
+    require => Service['zuul'],
+  }
 }