diff --git a/images/web/config/production.conf b/images/web/config/production.conf
index 5ef5619b..b2ed3717 100644
--- a/images/web/config/production.conf
+++ b/images/web/config/production.conf
@@ -3,30 +3,38 @@
     # Tell Apache and Passenger where your app's 'public' directory is
     DocumentRoot /var/www/public
     PassengerRuby /usr/bin/ruby
+
+    # CORS headers
+    Header set Access-Control-Allow-Origin "*"
+    Header set Access-Control-Allow-Methods "GET, POST, OPTIONS"
+    Header set Access-Control-Allow-Headers "Origin, X-Requested-With, Content-Type, Accept"
+
     RewriteEngine On
+
+    # Handle preflight requests
+    RewriteCond %{REQUEST_METHOD} OPTIONS
+    RewriteRule ^(.*)$ $1 [R=200,L,E=HTTP_ACCESS_CONTROL_ALLOW_HEADERS: Origin, X-Requested-With, Content-Type, Accept]
+
+    # Avoid redirects for preflight
+    RewriteCond %{REQUEST_METHOD} !OPTIONS
+
+    # Existing rewrites for HTTPS and www
     RewriteCond %{HTTP:X-Forwarded-Proto} =http
-    #  Development mode in case domain is localhost
-    # Rewrite to HTTPS
     RewriteCond %{HTTP_HOST} !=localhost
     RewriteCond %{HTTPS} off
     RewriteRule .* https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
-    # Rewrite to www. [NC] is a case-insensitive match
+
     RewriteCond %{HTTP_HOST} !=localhost
-    # Avoid redirect staging sites 
     RewriteCond %{HTTP_HOST} !=staging.openhistoricalmap.org
     RewriteCond %{HTTP_HOST} !^www\. [NC]
     RewriteRule .* https://www.%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
 
-    # ======Redirect trafict to CGIMAP====
-    # Rules to redirect to port 81
+    # Existing rewrites for CGIMAP
     RewriteCond %{REQUEST_URI} ^/api/0\.6/map
     RewriteRule ^.*$ http://127.0.0.1:81%{REQUEST_URI} [P,L]
-    # Existing rewrites
     RewriteRule ^0\.6/map$ - [L,H=fcgi:127.0.0.1:81]
     RewriteRule ^0\.6/(nodes|ways|relations)$ - [L,H=fcgi:127.0.0.1:81]
     RewriteRule ^0\.6/(way|relation)/([^/]+)/full$ - [L,H=fcgi:127.0.0.1:81]
-    
-    # If no match found, fall through to port 80
     RewriteCond %{REQUEST_METHOD} ^(GET|HEAD)$
     RewriteRule ^0\.6/(node|way|relation)/([^/]+)$ - [L,H=fcgi:127.0.0.1:80]