1 files changed, 9 insertions, 7 deletions
diff --git a/kubernetes/contrib/components/ejbca/values.yaml b/kubernetes/contrib/components/ejbca/values.yaml
index c26bfe2fbb..69d993e9a4 100644
--- a/kubernetes/contrib/components/ejbca/values.yaml
+++ b/kubernetes/contrib/components/ejbca/values.yaml
@@ -58,12 +58,10 @@ ejbca:
 pullPolicy: Always
 
 mariadb-galera:
-  # '&mariadbConfig' means we "store" the values for  later use in the file
-  # with '*mariadbConfig' pointer.
-  config: &mariadbConfig
-    userCredentialsExternalSecret: *ejbca-db-secret
-    mysqlDatabase: *dbName
-  nameOverride: ejbca-galera
+  db:
+    externalSecret: *ejbca-db-secret
+    name: *dbName
+  nameOverride: &ejbca-galera ejbca-galera
   service:
     name: ejbca-galera
     portName: ejbca-galera
@@ -72,9 +70,13 @@ mariadb-galera:
   persistence:
     enabled: true
     mountSubPath: ejbca/maria/data
+  serviceAccount:
+    nameOverride: *ejbca-galera
 
 mariadb-init:
-  config: *mariadbConfig
+  config:
+    userCredentialsExternalSecret: *ejbca-db-secret
+    mysqlDatabase: *dbName
   nameOverride: ejbca-config
 
 nodeSelector: {}