diff --git a/src/main/helm/templates/route.yaml b/src/main/helm/templates/route.yaml
index 0f86471e20d37042968af11b9d2e1a0a3666c69b..3990bd3da3d69d123d823266be847b840998916f 100644
--- a/src/main/helm/templates/route.yaml
+++ b/src/main/helm/templates/route.yaml
@@ -2,13 +2,13 @@ kind: Route
 apiVersion: route.openshift.io/v1
 metadata:
   name: {{ .Release.Name }}-passthrough
-  namespace: by-enable-dev
+  namespace: {{ include "app.namespace" . }}
 
 spec:
   host: {{ .Release.Name }}-passthrough-{{ include "app.baseDomain" . }}
   to:
     kind: Service
-    name: xta-test-server
+    name: {{ .Release.Name }}
     weight: 100
   port:
     targetPort: 8443
@@ -18,6 +18,6 @@ spec:
 status:
   ingress:
     - host: {{ .Release.Name }}-passthrough-{{ include "app.baseDomain" . }}
-      routerName: default
+      routerName: {{ .Values.router.name }}
       wildcardPolicy: None
-      routerCanonicalHostname: router-default.apps.okd.dev.by.ozg-cloud.systems
+      routerCanonicalHostname: {{ .Values.router.hostname }}
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index 9fe80af86bf6f295bcd48273f6e6bdd63c411568..c1c36245d8f78481cf5c3d78b549f8a6f3a382e3 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -29,6 +29,10 @@ image:
   name: xta-test-server
   tag: latest
 
+router:
+  name: default
+  hostname: router-default.apps.okd.dev.by.ozg-cloud.systems
+
 clientCertificateCommonNames:
   - clientA
   - clientB
diff --git a/src/test/helm/certificate_test.yaml b/src/test/helm/certificate_test.yaml
index cf78c770624db55707227add0f4efaec651a6469..a5de4a847d36c52cc525b7ca8ec19838e7710b25 100644
--- a/src/test/helm/certificate_test.yaml
+++ b/src/test/helm/certificate_test.yaml
@@ -63,6 +63,7 @@ tests:
       - equal:
           path: spec.dnsNames
           value:
+            - "xta-test-server-release-name-passthrough-helm.test.by.ozg-cloud.de"
             - "xta-test-server-release-name-helm.test.by.ozg-cloud.de"
   - it: should contain default lables and component lables
     asserts:
diff --git a/src/test/helm/route_test.yaml b/src/test/helm/route_test.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f1d485991f27c9b2987370301ef12fb7d8bf53ea
--- /dev/null
+++ b/src/test/helm/route_test.yaml
@@ -0,0 +1,52 @@
+suite: test route.yaml
+release:
+  name: releasename
+  namespace: sh-helm-test
+templates:
+  - templates/route.yaml
+set:  
+  ozgcloud:
+    bezeichner: helm
+  baseUrl: test.by.ozg-cloud.de
+
+tests:
+  - it: check route kind
+    asserts:
+      - isKind:
+          of: Route
+  - it: should set passthrough hostname
+    asserts:
+      - equal:
+          path: spec.host
+          value: releasename-passthrough-helm.test.by.ozg-cloud.de
+  - it: should set service name
+    asserts:
+      - equal:
+          path: spec.to.name
+          value: releasename
+  - it: should set target port
+    asserts:
+      - equal:
+          path: spec.port.targetPort
+          value: 8443
+  - it: should set passthrough tls termination
+    asserts:
+      - equal:
+          path: spec.tls.termination
+          value: passthrough
+
+  - it: should set ingress passthrough hostname
+    asserts:
+      - equal:
+          path: status.ingress[0].host
+          value: releasename-passthrough-helm.test.by.ozg-cloud.de
+  - it: should set router name
+    asserts:
+      - equal:
+          path: status.ingress[0].routerName
+          value: default
+  - it: should set router hostname
+    asserts:
+      - equal:
+          path: status.ingress[0].routerCanonicalHostname
+          value: router-default.apps.okd.dev.by.ozg-cloud.systems