diff --git a/charts/tracetest-public-endpoint/templates/cors_middleware.yaml b/charts/tracetest-public-endpoint/templates/cors_middleware.yaml
index 1dfae52..dbf1f4f 100644
--- a/charts/tracetest-public-endpoint/templates/cors_middleware.yaml
+++ b/charts/tracetest-public-endpoint/templates/cors_middleware.yaml
@@ -1,8 +1,7 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ .Release.Name }}-cors-allowed
-  namespace: default
+  name: {{ include "tracetest-cloud.fullname" . }}-cors
 spec:
   headers:
     accessControlAllowHeaders:
diff --git a/charts/tracetest-public-endpoint/templates/ingressroute.yaml b/charts/tracetest-public-endpoint/templates/ingressroute.yaml
index 39eda87..db85650 100644
--- a/charts/tracetest-public-endpoint/templates/ingressroute.yaml
+++ b/charts/tracetest-public-endpoint/templates/ingressroute.yaml
@@ -9,7 +9,7 @@ spec:
   - kind: Rule
     match: Host(`{{ .Values.global.urls.otlpingest.hostname }}`) && PathPrefix(`/opentelemetry.proto.collector.trace.v1.TraceService/Export`)
     middlewares:
-    - name: {{ .Release.Name }}-cors-allowed
+    - name: {{ include "tracetest-cloud.fullname" . }}-cors
     services:
     - kind: Service
       name: {{ .Release.Name }}-public-endpoint-otel-collector