diff --git a/Tracking/docker-compose.yml b/Tracking/docker-compose.yml
index 2615c7d..d3766c8 100644
--- a/Tracking/docker-compose.yml
+++ b/Tracking/docker-compose.yml
@@ -18,18 +18,22 @@ services:
       ## Expose Ackee Through Trefik ##
       - "traefik.enable=true" # <== Enable traefik to proxy this container
       
-      - "traefik.http.middlewares.corsheaders.headers.accesscontrolallowmethods=GET,POST,PATCH,OPTIONS"
-      - "traefik.http.middlewares.corsheaders.headers.accesscontrolalloworiginlist=luke-else.co.uk"
-      - "traefik.http.middlewares.corsheaders.headers.accessControlAllowHeaders=Content-Type"
+      # Enable CORS headers
+      - "traefik.http.middlewares.cors.headers.accesscontrolallowmethods=*"
+      - "traefik.http.middlewares.cors.headers.accesscontrolalloworiginlist=*"
+      - "traefik.http.middlewares.cors.headers.accesscontrolmaxage=100"
+      - "traefik.http.middlewares.cors.headers.addvaryheader=true"
 
       - "traefik.http.middlewares.redirect-web-secure.redirectscheme.scheme=https"
       - "traefik.http.routers.ackee-insecure.middlewares=redirect-web-secure"
       - "traefik.http.routers.ackee-insecure.rule=Host(`tracking.luke-else.co.uk`)"
       - "traefik.http.routers.ackee-insecure.entrypoints=web"
+      - "traefik.http.routers.ackee-insecure.middlewares=cors"
 
       - "traefik.http.routers.ackee.rule=Host(`tracking.luke-else.co.uk`)"
       - "traefik.http.routers.ackee.entrypoints=websecure"
       - "traefik.http.routers.ackee.tls.certresolver=myresolver"
+      - "traefik.http.routers.ackee.middlewares=cors"
     depends_on:
       - mongo
     restart: unless-stopped