diff --git a/nginx.conf b/nginx.conf
index 57153e9..0229a51 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -49,7 +49,7 @@ http {
 
         # Media: images, icons, video, audio, HTC
         location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ {
-          expires 1M;
+          expires 1y;
           access_log off;
           add_header Cache-Control "public";
         }
@@ -57,7 +57,7 @@ http {
         # Javascript and CSS files
         location ~* \.(?:css|js)$ {
             try_files $uri =404;
-            expires 1y;
+            expires 1m;
             access_log off;
             add_header Cache-Control "public";
         }