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 e927c6f..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
@@ -7,7 +7,7 @@ metadata:
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
     nginx.ingress.kubernetes.io/proxy-buffer-size: "{{ .Values.global.nginxProxyBufferSize }}"
     nginx.ingress.kubernetes.io/proxy-buffers-number: "{{ .Values.global.nginxProxyBuffersNumber }}"
-    cert-manager.io/cluster-issuer: letsencrypt
+    # #cert-manager.io/cluster-issuer: letsencrypt
     # nginx.ingress.kubernetes.io/configuration-snippet: |
     #   more_set_input_headers "from-ingress: true";
 spec:
@@ -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 f0f3115..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
@@ -7,13 +7,13 @@ metadata:
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
     nginx.ingress.kubernetes.io/proxy-buffer-size: "{{ .Values.global.nginxProxyBufferSize }}"
     nginx.ingress.kubernetes.io/proxy-buffers-number: "{{ .Values.global.nginxProxyBuffersNumber }}"
-    cert-manager.io/cluster-issuer: letsencrypt
+    #cert-manager.io/cluster-issuer: letsencrypt
 spec:
   ingressClassName: nginx
   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 0af4e27..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
@@ -7,7 +7,7 @@ metadata:
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
     nginx.ingress.kubernetes.io/proxy-buffer-size: "{{ .Values.global.nginxProxyBufferSize }}"
     nginx.ingress.kubernetes.io/proxy-buffers-number: "{{ .Values.global.nginxProxyBuffersNumber }}"
-    cert-manager.io/cluster-issuer: letsencrypt
+    #cert-manager.io/cluster-issuer: letsencrypt
     # nginx.ingress.kubernetes.io/configuration-snippet: |
     #   more_set_headers "blazor-environment: {{ .Values.global.dotnetEnvironment }}";
 spec:
@@ -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 62d6861..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
@@ -7,13 +7,13 @@ metadata:
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
     nginx.ingress.kubernetes.io/proxy-buffer-size: "{{ .Values.global.nginxProxyBufferSize }}"
     nginx.ingress.kubernetes.io/proxy-buffers-number: "{{ .Values.global.nginxProxyBuffersNumber }}"
-    cert-manager.io/cluster-issuer: letsencrypt
+    #cert-manager.io/cluster-issuer: letsencrypt
 spec:
   ingressClassName: nginx
   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 f72b98e..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
@@ -10,7 +10,7 @@ metadata:
 {{- if eq .Release.Name "eh-az" }}
     nginx.ingress.kubernetes.io/from-to-www-redirect: "true"
 {{- end }}
-    cert-manager.io/cluster-issuer: letsencrypt
+    #cert-manager.io/cluster-issuer: letsencrypt
 spec:
   ingressClassName: nginx
   tls:
@@ -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 }}"
diff --git a/etc/k8s/helm-chart/eventhub/values.azure.yaml b/etc/k8s/helm-chart/eventhub/values.azure.yaml
index c62cd80..aa96004 100644
--- a/etc/k8s/helm-chart/eventhub/values.azure.yaml
+++ b/etc/k8s/helm-chart/eventhub/values.azure.yaml
@@ -15,8 +15,8 @@ global:
   nginxProxyBuffersNumber: "8"
   defaultConnString: "Host=eh-az-postgresql;Port=5432;Database=EventHub;Username=root;Password=root"
   redisConfiguration: "eh-az-redis"
-  internalAuthServerAuthority: "http://account.openeventhub.com"
-  internalAuthServerRequireHttpsMetadata: "false"
+  internalAuthServerAuthority: "https://account.openeventhub.com"
+  internalAuthServerRequireHttpsMetadata: "true"
   stringEncryptionDefaultPassPhrase: "TxVIZFPxK33czbbv"
   imagePullPolicy: Always
   eventHubImageVersion: latest