diff --git a/deployment/puppet/fuel/templates/logrotate.conf.erb b/deployment/puppet/fuel/templates/logrotate.conf.erb
index 769c3fabf0..1e2baecb87 100644
--- a/deployment/puppet/fuel/templates/logrotate.conf.erb
+++ b/deployment/puppet/fuel/templates/logrotate.conf.erb
@@ -1,5 +1,4 @@
-/var/log/nailgun/api.log
-/var/log/nailgun/app.log
+/var/log/nailgun/*.log
 {
   copytruncate
   size 20M
diff --git a/deployment/puppet/openstack/templates/10-fuel-docker.conf.erb b/deployment/puppet/openstack/templates/10-fuel-docker.conf.erb
index 41080b6a69..61a037c5a5 100644
--- a/deployment/puppet/openstack/templates/10-fuel-docker.conf.erb
+++ b/deployment/puppet/openstack/templates/10-fuel-docker.conf.erb
@@ -4,36 +4,22 @@
 "/var/log/astute/*.log"
 "/var/log/audit/audit.log"
 "/var/log/auth.log"
-"/var/log/cobbler/*.log"
 "/var/log/cron.log"
 "/var/log/daemon.log"
 "/var/log/debug"
+"/var/log/dnsmasq.log"
 "/var/log/docker"
 "/var/log/docker-*.log"
-"/var/log/docker-logs/astute/*.log"
-"/var/log/docker-logs/cobbler/*.log"
-"/var/log/docker-logs/dnsmasq.log"
-"/var/log/docker-logs/httpd/*.log"
-"/var/log/docker-logs/mcollective.log"
-"/var/log/docker-logs/messages"
-"/var/log/docker-logs/nailgun/*.log"
-"/var/log/docker-logs/nginx/*.log"
-"/var/log/docker-logs/ostf*.log"
-"/var/log/docker-logs/ostf/*.log"
-"/var/log/docker-logs/rabbitmq/*.log"
-"/var/log/docker-logs/rsync.log"
-"/var/log/docker-logs/shotgun.log"
 "/var/log/fuelmenu.log"
-"/var/log/httpd/*"
 "/var/log/kern.log"
 "/var/log/mail.log"
+"/var/log/mcollective*.log"
 "/var/log/nailgun-agent.log"
-"/var/log/nailgun/*.log"
-"/var/log/nginx/*.log"
 "/var/log/ostf*.log"
-"/var/log/rabbitmq/*"
+"/var/log/ostf/*.log"
 "/var/log/remote/[1-9]*/*.log"
 "/var/log/remote/[1-9]*/*/*.log"
+"/var/log/rsync.log"
 "/var/log/shotgun.log"
 "/var/log/syslog"
 "/var/log/user.log"