diff --git a/Dockerfile b/Dockerfile
index 1d71c0ac..bee7644d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ ENV SWAGGER_JSON "/app/swagger.json"
 ENV PORT 8080
 ENV BASE_URL ""
 
-COPY ./docker/nginx.conf /etc/nginx/
+COPY ./docker/nginx.conf ./docker/cors.conf /etc/nginx/
 
 # copy swagger files to the `/js` folder
 COPY ./dist/* /usr/share/nginx/html/
diff --git a/docker/cors.conf b/docker/cors.conf
new file mode 100644
index 00000000..df1a6244
--- /dev/null
+++ b/docker/cors.conf
@@ -0,0 +1,14 @@
+add_header 'Access-Control-Allow-Origin' '*' always;
+add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+#
+# Custom headers and headers various browsers *should* be OK with but aren't
+#
+add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type' always;
+#
+# Tell client that this pre-flight info is valid for 20 days
+#
+add_header 'Access-Control-Max-Age' $access_control_max_age always;
+
+if ($request_method = OPTIONS) {
+  return 204;
+}
diff --git a/docker/nginx.conf b/docker/nginx.conf
index 94927db8..e0bba341 100644
--- a/docker/nginx.conf
+++ b/docker/nginx.conf
@@ -12,6 +12,10 @@ http {
 
   keepalive_timeout   65;
 
+  map $request_method $access_control_max_age {
+    OPTIONS 1728000; # 20 days
+  }
+
   server {
     listen            8080;
     server_name       localhost;
@@ -19,32 +23,15 @@ http {
 
     location / {
       alias            /usr/share/nginx/html/;
+      expires 1d;
 
-      if ($request_method = 'OPTIONS') {
-          add_header 'Access-Control-Allow-Origin' '*';
-          add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-          #
-          # Custom headers and headers various browsers *should* be OK with but aren't
-          #
-          add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-          #
-          # Tell client that this pre-flight info is valid for 20 days
-          #
-          add_header 'Access-Control-Max-Age' 1728000;
-          add_header 'Content-Type' 'text/plain charset=UTF-8';
-          add_header 'Content-Length' 0;
-          return 204;
-      }
-      if ($request_method = 'POST') {
-          add_header 'Access-Control-Allow-Origin' '*';
-          add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-          add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-      }
-      if ($request_method = 'GET') {
-          add_header 'Access-Control-Allow-Origin' '*';
-          add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-          add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
+      location ~* \.(?:json|yml|yaml)$ {
+        expires -1;
+
+        include cors.conf;
       }
+
+      include cors.conf;
     }
   }
 }
diff --git a/docker/run.sh b/docker/run.sh
index e5551315..959b02d6 100644
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -24,7 +24,7 @@ replace_or_delete_in_index () {
 }
 
 if [ "${BASE_URL}" ]; then
-  sed -i "s|location .* {|location $BASE_URL {|g" /etc/nginx/nginx.conf
+  sed -i "s|location / {|location $BASE_URL {|g" /etc/nginx/nginx.conf
 fi
 
 replace_in_index myApiKeyXXXX123456789 $API_KEY