diff --git a/charts/gxf/Chart.yaml b/charts/gxf/Chart.yaml
index 352c211..9cab780 100644
--- a/charts/gxf/Chart.yaml
+++ b/charts/gxf/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: gxf
 description: Generic GXF Helm chart
-version: '1.8.0'
+version: '1.8.1'
 icon: https://artwork.lfenergy.org/projects/grid-exchange-fabric/abbrev/color/grid-exchange-fabric-abbrev-color.png
 maintainers:
   - name: OSGP
diff --git a/charts/gxf/config/tomcat/server.xml b/charts/gxf/config/tomcat/server.xml
index 8b4b9ed..4564952 100644
--- a/charts/gxf/config/tomcat/server.xml
+++ b/charts/gxf/config/tomcat/server.xml
@@ -46,7 +46,7 @@ SPDX-License-Identifier: Apache-2.0
                prestartminSpareThreads="true"
                secretRequired="false" />
     {{- end }}
-    {{- if .Values.httpsConnector.enabled }}
+    {{- if and .Values.httpsConnector.enabled (not .Values.httpdSidecar.enabled) }}
     <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
                maxThreads="{{ $maxThreads }}" SSLEnabled="true" >
         <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
diff --git a/charts/gxf/templates/certificate-keystore-secret.yaml b/charts/gxf/templates/certificate-keystore-secret.yaml
new file mode 100644
index 0000000..693231f
--- /dev/null
+++ b/charts/gxf/templates/certificate-keystore-secret.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Secret 
+metadata:
+  name: {{ .Release.Name }}-keystore-password
+type: Opaque
+data:
+  keystore-password: {{ $secret := lookup "v1" "Secret" .Release.Namespace (printf "%s-keystore-password" .Release.Name) }}
+    {{- if $secret -}}
+      {{- index $secret "data" "keystore-password" -}}
+    {{- else -}}
+      {{- randAlphaNum 32 | b64enc | quote -}}
+    {{- end -}}
diff --git a/charts/gxf/templates/certificate.yaml b/charts/gxf/templates/certificate.yaml
index 6d412bb..53ae544 100644
--- a/charts/gxf/templates/certificate.yaml
+++ b/charts/gxf/templates/certificate.yaml
@@ -33,7 +33,7 @@ spec:
     pkcs12:
       create: true
       passwordSecretRef:
-        name: keystore-password
-        key: password
+        name: {{ $.Release.Name }}-keystore-password
+        key: keystore-password
 ---
 {{- end }}