diff --git a/manifests/logserver.pp b/manifests/logserver.pp
index 3801ad1..a7baf60 100644
--- a/manifests/logserver.pp
+++ b/manifests/logserver.pp
@@ -69,6 +69,12 @@ class openstackci::logserver (
     }
   }
 
+  if ! defined(Httpd::Mod['expires']) {
+    httpd::mod { 'expires':
+        ensure => present,
+    }
+  }
+
   ::httpd::vhost { "logs.${domain}":
     port     => 80,
     priority => '50',
diff --git a/templates/logs-dev.vhost.erb b/templates/logs-dev.vhost.erb
index 9fde2bb..14937fb 100644
--- a/templates/logs-dev.vhost.erb
+++ b/templates/logs-dev.vhost.erb
@@ -65,6 +65,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
     Order allow,deny
     allow from all
     Satisfy Any
+    ExpiresActive On
+    # Data in the logs server is static once generated by a job
+    ExpiresDefault "access plus 2 weeks"
   </Directory>
   <Directory /usr/local/lib/python2.7/dist-packages/os_loganalyze>
     Allow from all
diff --git a/templates/logs.vhost.erb b/templates/logs.vhost.erb
index e51b275..626fb85 100644
--- a/templates/logs.vhost.erb
+++ b/templates/logs.vhost.erb
@@ -68,6 +68,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
     Order allow,deny
     allow from all
     Satisfy Any
+    ExpiresActive On
+    # Data in the logs server is static once generated by a job
+    ExpiresDefault "access plus 2 weeks"
   </Directory>
   <Directory /usr/local/lib/python2.7/dist-packages/os_loganalyze>
     Allow from all