diff --git a/www-api/nginx/nginx.conf b/www-api/nginx/nginx.conf
index d9f4fdc1..4035aa46 100644
--- a/www-api/nginx/nginx.conf
+++ b/www-api/nginx/nginx.conf
@@ -33,19 +33,16 @@ http {
         location ~* \.(ico|css|js|gif|jpe?g|png)(\?[0-9]+)?$ {
                 expires max;
                 log_not_found off;
-                add_header 'Access-Control-Allow-Origin' '*' always;
         }
 
         location / {
                  try_files $uri $uri/ /index.php$is_args$args;
-                 add_header 'Access-Control-Allow-Origin' '*' always;
         }
 
         location ~ \.php$ {
                 fastcgi_pass   host.docker.internal:9999;
                 fastcgi_param  SCRIPT_FILENAME /opt/mainsite/wrenchboard/www-api/public$fastcgi_script_name;
                 include        fastcgi_params;
-                add_header 'Access-Control-Allow-Origin' '*' always;
         }
 
         error_page 404 /index.php;
@@ -55,6 +52,39 @@ http {
                 deny all;
         }
 
+        #
+        # Wide-open CORS config for nginx
+        #
+        location / {
+             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,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
+                #
+                # 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' '*' always;
+                add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+                add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;
+                add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
+             }
+             if ($request_method = 'GET') {
+                add_header 'Access-Control-Allow-Origin' '*' always;
+                add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+                add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;
+                add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
+             }
+        }
+
         location /svs/bko/ {
             try_files $uri $uri/ /svs/bko/bkove.php?$args;
             proxy_intercept_errors off;