diff --git a/charts/gxf/Chart.yaml b/charts/gxf/Chart.yaml
index d4795b5..5ac46a3 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.2'
+version: '1.8.3'
 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/templates/certificate-keystore-secret.yaml b/charts/gxf/templates/certificate-keystore-secret.yaml
index 867ff00..f5d25f8 100644
--- a/charts/gxf/templates/certificate-keystore-secret.yaml
+++ b/charts/gxf/templates/certificate-keystore-secret.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Release.Name }}-keystore-password
+  name: {{ .Values.keystore.keystoreSecretName | default (printf "%s-keystore-password" .Release.Name) }}
   annotations:
     {{- if .Values.keystore.managedBySealedSecrets }}
     sealedsecrets.bitnami.com/managed: "true"
diff --git a/charts/gxf/values.yaml b/charts/gxf/values.yaml
index 171d83f..5607119 100644
--- a/charts/gxf/values.yaml
+++ b/charts/gxf/values.yaml
@@ -116,5 +116,5 @@ certificates: []
   #     - example.com
 keystore:
   generateSecret: false  # Set to true if you want to generate a new secret
-  sealedSecretsManaged: false  # Set to false if the annotation should not be added
+  managedBySealedSecret: false  # Set to false if the annotation should not be added
   keystoreSecretName: ""