diff --git a/etc/k8s/helm-chart/eventhub/charts/account/templates/account-ingress.yaml b/etc/k8s/helm-chart/eventhub/charts/account/templates/account-ingress.yaml
index 038f676..cf3b239 100644
--- a/etc/k8s/helm-chart/eventhub/charts/account/templates/account-ingress.yaml
+++ b/etc/k8s/helm-chart/eventhub/charts/account/templates/account-ingress.yaml
@@ -15,7 +15,7 @@ spec:
   tls:
   - hosts:
       - {{ .Values.global.accountDomain }}
-    secretName: {{ .Release.Name }}-{{ .Chart.Name }}-tls
+    secretName: oeh-origin-tls
   rules:
   - host: "{{ .Values.global.accountDomain }}"
     http:
diff --git a/etc/k8s/helm-chart/eventhub/charts/admin-api/templates/admin-api-ingress.yaml b/etc/k8s/helm-chart/eventhub/charts/admin-api/templates/admin-api-ingress.yaml
index d33800b..2b635bd 100644
--- a/etc/k8s/helm-chart/eventhub/charts/admin-api/templates/admin-api-ingress.yaml
+++ b/etc/k8s/helm-chart/eventhub/charts/admin-api/templates/admin-api-ingress.yaml
@@ -13,7 +13,7 @@ spec:
   tls:
   - hosts:
       - {{ .Values.global.adminApiDomain }}
-    secretName: {{ .Release.Name }}-{{ .Chart.Name }}-tls
+    secretName: oeh-origin-tls
   rules:
   - host: "{{ .Values.global.adminApiDomain }}"
     http:
diff --git a/etc/k8s/helm-chart/eventhub/charts/admin/templates/admin-ingress.yaml b/etc/k8s/helm-chart/eventhub/charts/admin/templates/admin-ingress.yaml
index bdfd05f..9ff9af4 100644
--- a/etc/k8s/helm-chart/eventhub/charts/admin/templates/admin-ingress.yaml
+++ b/etc/k8s/helm-chart/eventhub/charts/admin/templates/admin-ingress.yaml
@@ -15,7 +15,7 @@ spec:
   tls:
   - hosts:
       - {{ .Values.global.adminDomain }}
-    secretName: {{ .Release.Name }}-{{ .Chart.Name }}-tls
+    secretName: oeh-origin-tls
   rules:
   - host: "{{ .Values.global.adminDomain }}"
     http:
diff --git a/etc/k8s/helm-chart/eventhub/charts/api/templates/api-ingress.yaml b/etc/k8s/helm-chart/eventhub/charts/api/templates/api-ingress.yaml
index fbaa668..7e74fbf 100644
--- a/etc/k8s/helm-chart/eventhub/charts/api/templates/api-ingress.yaml
+++ b/etc/k8s/helm-chart/eventhub/charts/api/templates/api-ingress.yaml
@@ -13,7 +13,7 @@ spec:
   tls:
   - hosts:
       - {{ .Values.global.apiDomain }}
-    secretName: {{ .Release.Name }}-{{ .Chart.Name }}-tls
+    secretName: oeh-origin-tls
   rules:
   - host: "{{ .Values.global.apiDomain }}"
     http:
diff --git a/etc/k8s/helm-chart/eventhub/charts/www/templates/www-ingress.yaml b/etc/k8s/helm-chart/eventhub/charts/www/templates/www-ingress.yaml
index 232f7be..ec84ff0 100644
--- a/etc/k8s/helm-chart/eventhub/charts/www/templates/www-ingress.yaml
+++ b/etc/k8s/helm-chart/eventhub/charts/www/templates/www-ingress.yaml
@@ -19,7 +19,7 @@ spec:
 {{- if eq .Release.Name "eh-az" }}
       - {{ print "www." .Values.global.wwwDomain }}
 {{- end }}
-    secretName: {{ .Release.Name }}-{{ .Chart.Name }}-tls
+    secretName: oeh-origin-tls
   rules:
 {{- if eq .Release.Name "eh-az" }}
   - host: "{{ print "www." .Values.global.wwwDomain }}"