diff --git a/devspc/devspace-api/templates/ingress.yaml b/devspc/devspace-api/templates/ingress.yaml
index ffa7fbd..5ea72f8 100644
--- a/devspc/devspace-api/templates/ingress.yaml
+++ b/devspc/devspace-api/templates/ingress.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{$.Release.Name}}-{{$.Chart.Name}}
   namespace: {{$.Release.Namespace}}
   annotations:
-    traefik.ingress.kubernetes.io/router.middlewares: {{$.Release.Namespace}}-{{$.Release.Name}}-url-prefix@kubernetescrd
+    traefik.ingress.kubernetes.io/router.middlewares: {{$.Release.Namespace}}-{{$.Release.Name}}-url-prefix@kubernetescrd,{{$.Release.Namespace}}-{{$.Release.Name}}-cors@kubernetescrd
 spec:
   rules:
     - host: {{tpl $.Values.ingress.host .}}
diff --git a/devspc/devspace-apiregistry-core-service/templates/middleware.yaml b/devspc/devspace-api/templates/middleware-cors.yaml
similarity index 100%
rename from devspc/devspace-apiregistry-core-service/templates/middleware.yaml
rename to devspc/devspace-api/templates/middleware-cors.yaml
diff --git a/devspc/devspace-api/templates/middleware.yaml b/devspc/devspace-api/templates/middleware-url-prefix.yaml
similarity index 100%
rename from devspc/devspace-api/templates/middleware.yaml
rename to devspc/devspace-api/templates/middleware-url-prefix.yaml
diff --git a/devspc/devspace-apiregistry-core-service/templates/middleware-cors.yaml b/devspc/devspace-apiregistry-core-service/templates/middleware-cors.yaml
new file mode 100644
index 0000000..4dae136
--- /dev/null
+++ b/devspc/devspace-apiregistry-core-service/templates/middleware-cors.yaml
@@ -0,0 +1,23 @@
+apiVersion: traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: {{$.Release.Name}}-cors
+  namespace: {{$.Release.Namespace}}
+spec:
+  headers:
+    accessControlAllowMethods:
+      - "GET"
+      - "POST"
+      - "PUT"
+      - "DELETE"
+      - "OPTIONS"
+      - "PATCH"
+    accessControlAllowHeaders:
+      - "*"
+    accessControlAllowOriginList:
+      - "*"
+    accessControlMaxAge: 100
+    addVaryHeader: true
+    accessControlAllowCredentials: true
+    customResponseHeaders:
+      X-CORS-Middleware: "enabled"
\ No newline at end of file