diff --git a/frontend/httpd.conf b/frontend/httpd.conf
index 425d969b69..9f8d55a106 100644
--- a/frontend/httpd.conf
+++ b/frontend/httpd.conf
@@ -131,7 +131,7 @@ LoadModule log_config_module modules/mod_log_config.so
 LoadModule env_module modules/mod_env.so
 #LoadModule mime_magic_module modules/mod_mime_magic.so
 #LoadModule cern_meta_module modules/mod_cern_meta.so
-#LoadModule expires_module modules/mod_expires.so
+LoadModule expires_module modules/mod_expires.so
 LoadModule headers_module modules/mod_headers.so
 #LoadModule ident_module modules/mod_ident.so
 #LoadModule usertrack_module modules/mod_usertrack.so
@@ -231,21 +231,28 @@ SSLProxyEngine On
 
 # Cache rules
 
-# Add cache for web node files
-; <FilesMatch "\.(js|wasm)$">
-;     Header set Cache-Control "public, max-age=31536000, immutable"
-; </FilesMatch>
-
 # REMOVE CACHE
-<filesMatch "\.(html|htm|js|css)$">
-  FileETag None
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</filesMatch>
+<IfModule mod_expires.c>
+    ExpiresActive On
+    ExpiresByType text/html "access plus 0 seconds"
+    ExpiresByType text/htm "access plus 0 seconds"
+    ExpiresByType application/javascript "access plus 0 seconds"
+    ExpiresByType text/javascript "access plus 0 seconds"
+    ExpiresByType application/x-javascript "access plus 0 seconds"
+    ExpiresByType text/css "access plus 0 seconds"
+    ExpiresByType application/wasm "access plus 0 seconds"
+    ExpiresByType application/octet-stream "access plus 0 seconds"
+    ExpiresByType application/json "access plus 0 seconds"
+    ExpiresByType application/postcard "access plus 0 seconds"
+    ExpiresByType application/octet-stream "access plus 0 seconds"
+</IfModule>
+
+<IfModule mod_headers.c>
+    Header unset ETag
+    Header unset Last-Modified
+    Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
+    Header set Pragma "no-cache"
+</IfModule>
 
 
 # Make sure mod_headers is enabled