diff --git a/Chart.lock b/Chart.lock
index 647340c..57006b7 100644
--- a/Chart.lock
+++ b/Chart.lock
@@ -3,13 +3,13 @@ dependencies:
   repository: https://charts.bitnami.com/bitnami
   version: 6.3.2
 - name: mysql
-  repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-  version: 6.14.10
+  repository: https://charts.bitnami.com/bitnami
+  version: 9.4.5
 - name: postgresql
   repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
   version: 10.3.17
 - name: mariadb
   repository: https://charts.bitnami.com/bitnami
   version: 11.4.2
-digest: sha256:10516937fb2fd61045984a8d875b22c79dc80b4b6bad02c86e044dd2b7898983
-generated: "2023-01-03T22:04:32.6044332+01:00"
+digest: sha256:6200d37686cc99137552a08e744535c86f613fe54e1a4ff9e5da932dbb2184ee
+generated: "2023-01-03T22:26:33.482759+01:00"
diff --git a/Chart.yaml b/Chart.yaml
index 31ee251..8670211 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -29,8 +29,8 @@ dependencies:
   version: 6.3.2
   condition: memcached.enabled
 - name: mysql
-  repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-  version: 6.14.10
+  repository: https://charts.bitnami.com/bitnami
+  version: 9.4.5
   condition: mysql.enabled
 - name: postgresql
   repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
diff --git a/README.md b/README.md
index cf4226c..8c6ddea 100644
--- a/README.md
+++ b/README.md
@@ -747,15 +747,15 @@ gitea:
 
 ### MySQL
 
-| Name                     | Description                                                        | Value   |
-| ------------------------ | ------------------------------------------------------------------ | ------- |
-| `mysql.enabled`          | Enable MySQL                                                       | `false` |
-| `mysql.root.password`    | Password for the root user. Ignored if existing secret is provided | `gitea` |
-| `mysql.db.user`          | Username of new user to create.                                    | `gitea` |
-| `mysql.db.password`      | Password for the new user.Ignored if existing secret is provided   | `gitea` |
-| `mysql.db.name`          | Name for new database to create.                                   | `gitea` |
-| `mysql.service.port`     | Port to connect to MySQL service                                   | `3306`  |
-| `mysql.persistence.size` | PVC Storage Request for MySQL volume                               | `10Gi`  |
+| Name                                | Description                                                        | Value   |
+| ----------------------------------- | ------------------------------------------------------------------ | ------- |
+| `mysql.enabled`                     | Enable MySQL                                                       | `false` |
+| `mysql.auth.database`               | Name for new database to create.                                   | `gitea` |
+| `mysql.auth.username`               | Username of new user to create.                                    | `gitea` |
+| `mysql.auth.password`               | Password for the new user.Ignored if existing secret is provided   | `gitea` |
+| `mysql.auth.rootPassword`           | Password for the root user. Ignored if existing secret is provided | `gitea` |
+| `mysql.primary.service.ports.mysql` | Port to connect to MySQL service                                   | `3306`  |
+| `mysql.primary.persistence.size`    | PVC Storage Request for MySQL volume                               | `10Gi`  |
 
 ### MariaDB
 
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 3851acf..0d5f618 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -96,7 +96,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{- define "mysql.dns" -}}
-{{- printf "%s-mysql.%s.svc.%s:%g" .Release.Name .Release.Namespace .Values.clusterDomain .Values.mysql.service.port | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-mysql.%s.svc.%s:%g" .Release.Name .Release.Namespace .Values.clusterDomain .Values.mysql.primary.service.ports.mysql | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{- define "mariadb.dns" -}}
diff --git a/values.yaml b/values.yaml
index 70e007e..a8817be 100644
--- a/values.yaml
+++ b/values.yaml
@@ -426,24 +426,25 @@ postgresql:
 ## @section MySQL
 #
 ## @param mysql.enabled Enable MySQL
-## @param mysql.root.password Password for the root user. Ignored if existing secret is provided
-## @param mysql.db.user Username of new user to create.
-## @param mysql.db.password Password for the new user.Ignored if existing secret is provided
-## @param mysql.db.name Name for new database to create.
-## @param mysql.service.port Port to connect to MySQL service
-## @param mysql.persistence.size PVC Storage Request for MySQL volume
+## @param mysql.auth.database Name for new database to create.
+## @param mysql.auth.username Username of new user to create.
+## @param mysql.auth.password Password for the new user.Ignored if existing secret is provided
+## @param mysql.auth.rootPassword Password for the root user. Ignored if existing secret is provided
+## @param mysql.primary.service.ports.mysql Port to connect to MySQL service
+## @param mysql.primary.persistence.size PVC Storage Request for MySQL volume
 mysql:
   enabled: false
-  root:
+  auth:
+    database: gitea
+    username: gitea
     password: gitea
-  db:
-    user: gitea
-    password: gitea
-    name: gitea
-  service:
-    port: 3306
-  persistence:
-    size: 10Gi
+    rootPassword: gitea
+  primary:
+    service:
+      ports:
+        mysql: 3306
+    persistence:
+      size: 10Gi
 
 ## @section MariaDB
 #