diff --git a/nginx.conf b/nginx.conf
index 43ebd4a..029fb69 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -6,6 +6,7 @@ server {
 
     location /signatures {
         root   /usr/share/nginx/html;
+        expires 30d;
         
         # Base on: https://michielkalkman.com/snippets/nginx-cors-open-configuration/
         if ($request_method = 'OPTIONS') {
@@ -30,15 +31,16 @@ server {
             return 204;
         }
         if ($request_method = 'GET') {
-            add_header 'Access-Control-Allow-Origin' '*';
-            add_header 'Access-Control-Allow-Credentials' 'true';
-            add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS';
-            add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
+            add_header 'Access-Control-Allow-Origin' '*' always;
+            add_header 'Access-Control-Allow-Credentials' 'true' always;
+            add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS' always;
+            add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type' always;
         }
     }
 
     location /assets {
         root   /usr/share/nginx/html;
+        expires 30d;
         
         # Base on: https://michielkalkman.com/snippets/nginx-cors-open-configuration/
         if ($request_method = 'OPTIONS') {
@@ -63,10 +65,10 @@ server {
             return 204;
         }
         if ($request_method = 'GET') {
-            add_header 'Access-Control-Allow-Origin' '*';
-            add_header 'Access-Control-Allow-Credentials' 'true';
-            add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS';
-            add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
+            add_header 'Access-Control-Allow-Origin' '*' always;
+            add_header 'Access-Control-Allow-Credentials' 'true' always;
+            add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS' always;
+            add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type' always;
         }
     }