diff --git a/nginx.conf b/nginx.conf
index 3e781cd46e9d59b100b53dd9f61e434be8af97a5..3ea6a31df6d367c1ed6376cd4668bac316206217 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -77,9 +77,9 @@ http {
 
     # Adding the cache control header for js and css files
     # Make sure it is BELOW the PHP block
-    location ~* \.(?:css|js)$ {
+    location ~ \.(?:css|js|woff|svg|gif)$ {
         try_files $uri /index.php$uri$is_args$args;
-        add_header Cache-Control "public, max-age=7200";
+        add_header Cache-Control "public, max-age=15778463";
         # Add headers to serve security related headers (It is intended to
         # have those duplicated to the ones above)
         # Before enabling Strict-Transport-Security headers please read into