diff --git a/src/main/helm/templates/configmap_bindings_type.yaml b/src/main/helm/templates/configmap_bindings_type.yaml
index d56b2505d154567012dff38fe9ef5b50887b45a5..6e64b9a162baa6d8adbfe2ae4d773406b50fc939 100644
--- a/src/main/helm/templates/configmap_bindings_type.yaml
+++ b/src/main/helm/templates/configmap_bindings_type.yaml
@@ -26,7 +26,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: bindings-type
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "app.namespace" . }}
 data:
   type: |
     ca-certificates
\ No newline at end of file
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index b4923f25c3bd7d683c9c6a15e9eedc409f31c64b..adabc841451041d927704f8da03742a893215cb2 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -26,7 +26,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Release.Name }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "app.namespace" . }}
   labels:
     {{- include "app.defaultLabels" . | indent 4 }}
     component: bayernid-proxy
diff --git a/src/main/helm/templates/grpc_certificate.yaml b/src/main/helm/templates/grpc_certificate.yaml
index 94943b038637c582e735426af31c27de51ec0a47..4f294c96c6b1220cd148a91d228acc8e0b1added 100644
--- a/src/main/helm/templates/grpc_certificate.yaml
+++ b/src/main/helm/templates/grpc_certificate.yaml
@@ -27,11 +27,11 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: bayernid-proxy-grpc-tls-certificate
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "app.namespace" . }}
 spec:
   secretName: bayernid-proxy-grpc-tls-cert
   issuerRef:
-    name: {{ .Release.Namespace }}-ca-issuer
+    name: {{ include "app.namespace" . }}-ca-issuer
     kind: Issuer
   duration: 8760h0m0s # 1 Jahr
   renewBefore: 5840h0m0s # 8 Monate
@@ -40,10 +40,10 @@ spec:
     algorithm: RSA
     encoding: PKCS8
   dnsNames:
-    - "*.{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local"
-    - "{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local"
-    - "{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster"
-    - "{{ .Release.Name }}.{{ .Release.Namespace }}.svc"
-    - "{{ .Release.Name }}.{{ .Release.Namespace }}"
+    - "*.{{ .Release.Name }}.{{ include "app.namespace" . }}.svc.cluster.local"
+    - "{{ .Release.Name }}.{{ include "app.namespace" . }}.svc.cluster.local"
+    - "{{ .Release.Name }}.{{ include "app.namespace" . }}.svc.cluster"
+    - "{{ .Release.Name }}.{{ include "app.namespace" . }}.svc"
+    - "{{ .Release.Name }}.{{ include "app.namespace" . }}"
     - "{{ .Release.Name }}"
 {{- end }}
\ No newline at end of file
diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index 839faecf67560b9930427847b5500aaee8478884..4e6bce277abdb8b56db1ce55ca9cd4151662e0c7 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -27,7 +27,7 @@ apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
   name: network-policy-bayernid-proxy
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "app.namespace" . }}
 spec:
   podSelector:
     matchLabels:
diff --git a/src/main/helm/templates/service.yaml b/src/main/helm/templates/service.yaml
index 02ce38d9d4422c084d4a0bd66ae6985b9b0a664e..532b76c955fee9570f85fd2651335a065e15076e 100644
--- a/src/main/helm/templates/service.yaml
+++ b/src/main/helm/templates/service.yaml
@@ -26,7 +26,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{.Release.Name }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "app.namespace" . }}
   labels:
     {{- include "app.defaultLabels" . | indent 4 }}
     component: bayernid-proxy
diff --git a/src/main/helm/templates/service_account.yaml b/src/main/helm/templates/service_account.yaml
index 231d53f52dfe67b27f474ebf552d1e10a052f042..3bac8e223d1fd108b386d1f06ed4e9fb2284a67c 100644
--- a/src/main/helm/templates/service_account.yaml
+++ b/src/main/helm/templates/service_account.yaml
@@ -27,5 +27,5 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "app.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "app.namespace" . }}
 {{- end }}
\ No newline at end of file