diff --git a/deployment/puppet/openstack/manifests/logrotate.pp b/deployment/puppet/openstack/manifests/logrotate.pp
index 0e53bc10c9..388dbf3d2f 100644
--- a/deployment/puppet/openstack/manifests/logrotate.pp
+++ b/deployment/puppet/openstack/manifests/logrotate.pp
@@ -75,6 +75,12 @@ class openstack::logrotate (
     after => '^minsize',
   }
 
+  file_line { 'logrotate-date-extension':
+    line  => 'dateformat -%Y%m%d-%s',
+    match => '^dateformat ',
+    after => '^dateext',
+  }
+
   if $debug {
     $interval = '10'
   } else {
diff --git a/deployment/puppet/openstack/spec/classes/openstack_logrotate_spec.rb b/deployment/puppet/openstack/spec/classes/openstack_logrotate_spec.rb
index 161125de97..ba98835709 100644
--- a/deployment/puppet/openstack/spec/classes/openstack_logrotate_spec.rb
+++ b/deployment/puppet/openstack/spec/classes/openstack_logrotate_spec.rb
@@ -31,7 +31,8 @@ describe 'openstack::logrotate' do
          'logrotate-compress',
          'logrotate-delaycompress',
          'logrotate-minsize',
-         'logrotate-maxsize',].each do |item|
+         'logrotate-maxsize',
+         'logrotate-date-extension',].each do |item|
           should contain_file_line(item)
         end
         should contain_cron('fuel-logrotate').with_minute('*/30')
diff --git a/deployment/puppet/openstack/templates/10-fuel.conf.erb b/deployment/puppet/openstack/templates/10-fuel.conf.erb
index 325be50fea..e8430097c7 100644
--- a/deployment/puppet/openstack/templates/10-fuel.conf.erb
+++ b/deployment/puppet/openstack/templates/10-fuel.conf.erb
@@ -48,6 +48,7 @@
   notifempty
 
   # logrotate allows to use only year, month, day and unix epoch
+  dateext
   dateformat -%Y%m%d-%s
 
   # number of rotated files to keep