diff --git a/charts/ejbca/Chart.yaml b/charts/ejbca/Chart.yaml
index 361e27db6a..ef51264755 100644
--- a/charts/ejbca/Chart.yaml
+++ b/charts/ejbca/Chart.yaml
@@ -13,12 +13,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "0.0.0"
+version: "9.0.0"
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "latest"
+appVersion: "9.0.0"
 #dependencies:
 #- name: postgresql
 #  repository: "https://charts.bitnami.com/bitnami"
diff --git a/charts/ejbca/values.yaml b/charts/ejbca/values.yaml
index 7cfe94bec3..97a3d7f4e1 100644
--- a/charts/ejbca/values.yaml
+++ b/charts/ejbca/values.yaml
@@ -15,7 +15,6 @@ ejbca:
     configMapName: # Option 1: Specify a ConfigMap containing your EJBCA ConfigDump JSON data
     configMapKey: # (Optional) The key in the ConfigMap where the EJBCA ConfigDump data is found (default: "configdump.json")
     inlineConfigdump: # Option 2: Directly insert your EJBCA ConfigDump JSON data here
-
   ## not recommended: applicable only when direct HTTP access to EJBCA is enabled
   importAppserverKeystore: false
   #appserverKeystoreSecret: keystore-secret
@@ -40,18 +39,15 @@ ejbca:
     # INFO, DEBUG, TRACE, ERROR
     LOG_LEVEL_APP: "INFO"
     LOG_LEVEL_SERVER: "INFO"
-
     ## Observability
     # The IP address where port 8090 will listen for requests to /health, /health/ready,
     # /health/live and /metrics . Set this to 0.0.0.0 to bind to all container interfaces.
     OBSERVABLE_BIND: "127.0.0.1"
     # Set this to "true" to collect metrics and expose them at the /metrics endpoint for scraping.
     METRICS_ENABLED: false
-
     ## Global OCSP configurations
     OCSP_CHECK_SIGN_CERT_VALIDITY: true
     OCSP_NON_EXISTING_IS_GOOD: false
-
     ## SMTP configuration
     # Specify the FQDN or IP Address of the SMTP host for EJBCA to send email notifications.
     SMTP_DESTINATION: "localhost"
@@ -64,7 +60,6 @@ ejbca:
     SMTP_USERNAME: ejbca-mail
     # SMTP password should be given as secrets, see SMTP_PASSWORD secret in envRaw
     #SMTP_PASSWORD: ejbca
-
   #envRaw:
   #  - name: DATABASE_USER
   #    valueFrom:
@@ -104,9 +99,7 @@ ejbca:
   volumes: []
   # Extra volume mounts to be added to the deployment
   volumeMounts: []
-
 replicaCount: 1
-
 # https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
 updateStrategy: {}
 #  type: RollingUpdate
@@ -116,7 +109,7 @@ image:
   # Application variant: not set for full EJBCA, "ra" or "va"
   #variant: ra
   repository: keyfactor/ejbca-ce
-  tag: latest
+  tag: 9.0.0
   pullPolicy: IfNotPresent
 imagePullSecrets: []
 nameOverride: ""
@@ -135,7 +128,6 @@ podSecurityContext: {}
 # fsGroup: 2000
 # Annotations to add to the service EJBCA and nginx
 serviceAnnotations: {}
-
 securityContext: {}
 # capabilities:
 #   drop:
@@ -167,7 +159,6 @@ services:
   # Extra sidecar ports to be added to the service, optionally used when sidecarContainers
   # are defined and need to expose ports
   sidecarPorts: []
-
 # Recommended for cluster internal communications
 # Requires services.proxyHttp to be enabled
 nginx:
@@ -190,7 +181,6 @@ nginx:
     # create a load balancer service for each Pod with separate IP address
     enableReplicaSpecificAccess: false
   additionalHosts:
-
 # External communication from cluster
 # Requires services.proxyAJP or services.proxyHttp to be enabled for adminweb access
 ingress:
@@ -238,28 +228,21 @@ autoscaling:
   #     value: 4
   #     periodSeconds: 15
   #   selectPolicy: Max
-
 # https://kubernetes.io/docs/tasks/run-application/configure-pdb/
 podDisruptionBudget:
   create: false
   minAvailable: 1
   maxUnavailable: ""
-
 # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
 nodeSelector: {}
 affinity: {}
-
 # https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
 tolerations: []
-
 # https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/
 topologySpreadConstraints: []
-
 # https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
 priorityClassName: ""
-
 # https://kubernetes.io/docs/concepts/scheduling-eviction/kube-scheduler/
 schedulerName: ""
-
 # https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/
 terminationGracePeriodSeconds: ""