diff --git a/charts/buildbuddy-enterprise/Chart.yaml b/charts/buildbuddy-enterprise/Chart.yaml
index 06106abc..7c0d159a 100644
--- a/charts/buildbuddy-enterprise/Chart.yaml
+++ b/charts/buildbuddy-enterprise/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: BuildBuddy Enterprise
 name: buildbuddy-enterprise
-version: 0.0.273 # Chart version
+version: 0.0.274 # Chart version
 appVersion: 2.65.0 # Version of deployed app
 keywords:
   - buildbuddy
diff --git a/charts/buildbuddy-enterprise/charts/mysql-1.6.4.tgz b/charts/buildbuddy-enterprise/charts/mysql-1.6.4.tgz
deleted file mode 100644
index 89202e2b..00000000
Binary files a/charts/buildbuddy-enterprise/charts/mysql-1.6.4.tgz and /dev/null differ
diff --git a/charts/buildbuddy-enterprise/charts/mysql-11.1.0.tgz b/charts/buildbuddy-enterprise/charts/mysql-11.1.0.tgz
new file mode 100644
index 00000000..867a12cb
Binary files /dev/null and b/charts/buildbuddy-enterprise/charts/mysql-11.1.0.tgz differ
diff --git a/charts/buildbuddy-enterprise/requirements.lock b/charts/buildbuddy-enterprise/requirements.lock
index 6a45f133..a111d2b3 100644
--- a/charts/buildbuddy-enterprise/requirements.lock
+++ b/charts/buildbuddy-enterprise/requirements.lock
@@ -1,7 +1,7 @@
 dependencies:
 - name: mysql
-  repository: https://charts.helm.sh/stable
-  version: 1.6.4
+  repository: https://charts.bitnami.com/bitnami
+  version: 11.1.0
 - name: buildbuddy-redis
   repository: https://helm.buildbuddy.io
   version: 0.0.11
@@ -26,5 +26,5 @@ dependencies:
 - name: grafana
   repository: https://grafana.github.io/helm-charts
   version: 6.6.2
-digest: sha256:59082060763f0c9fe572f51c1e20b50a1c202b4819d51a43d9861bf1ddbe965c
-generated: "2024-06-14T21:09:22.039382286Z"
+digest: sha256:7a81f038eb0c870127c53ea414aeec8a4f25a6d5437e23f301b2ef57609f987c
+generated: "2024-06-17T17:41:52.440341+02:00"
diff --git a/charts/buildbuddy-enterprise/requirements.yaml b/charts/buildbuddy-enterprise/requirements.yaml
index 2e30f306..5fd1638e 100644
--- a/charts/buildbuddy-enterprise/requirements.yaml
+++ b/charts/buildbuddy-enterprise/requirements.yaml
@@ -1,7 +1,7 @@
 dependencies:
   - name: mysql
-    version: 1.6.4
-    repository: https://charts.helm.sh/stable
+    version: 11.1.0
+    repository: https://charts.bitnami.com/bitnami
     condition: mysql.enabled
   - name: buildbuddy-redis
     alias: redis
diff --git a/charts/buildbuddy-enterprise/templates/config.yaml b/charts/buildbuddy-enterprise/templates/config.yaml
index 9c0a688b..0284088e 100644
--- a/charts/buildbuddy-enterprise/templates/config.yaml
+++ b/charts/buildbuddy-enterprise/templates/config.yaml
@@ -20,7 +20,7 @@ data:
   {{- end }}
 
   {{- if .Values.mysql.enabled }}
-  {{- $_ := set $c.database "data_source" (print "mysql://" .Values.mysql.mysqlUser ":" .Values.mysql.mysqlPassword "@tcp(" .Release.Name "-mysql:3306)/" .Values.mysql.mysqlDatabase) }}
+  {{- $_ := set $c.database "data_source" (print "mysql://" .Values.mysql.auth.user ":" .Values.mysql.auth.password "@tcp(" .Release.Name "-mysql:3306)/" .Values.mysql.auth.database) }}
   {{- else if not .Values.config.database.data_source }}
   {{- $_ := set $c.database "data_source" "sqlite3:///tmp/buildbuddy-enterprise.db" }}
   {{- end }}
diff --git a/charts/buildbuddy-enterprise/templates/deployment.yaml b/charts/buildbuddy-enterprise/templates/deployment.yaml
index 95bc850b..46375c1c 100644
--- a/charts/buildbuddy-enterprise/templates/deployment.yaml
+++ b/charts/buildbuddy-enterprise/templates/deployment.yaml
@@ -54,7 +54,7 @@ spec:
       - name: "init-mysql"
         image: "{{ .Values.initContainerImage.repository }}:{{ .Values.initContainerImage.tag }}"
         imagePullPolicy: {{ .Values.initContainerImage.imagePullPolicy }}
-        command: ["sh", "-c", "until curl --max-time 10 http://{{ .Release.Name }}-mysql:3306; do echo waiting for {{ .Release.Name }}-mysql; sleep 5; done;"]
+        command: ["sh", "-c", "until nc -z {{ .Release.Name }}-mysql 3306; do echo waiting for {{ .Release.Name }}-mysql service; sleep 5; done;"]
       {{- end }}
       {{- if .Values.extraInitContainers }}
       {{- .Values.extraInitContainers | toYaml | nindent 6 }}
diff --git a/charts/buildbuddy-enterprise/values.yaml b/charts/buildbuddy-enterprise/values.yaml
index 094569c5..d41ad723 100644
--- a/charts/buildbuddy-enterprise/values.yaml
+++ b/charts/buildbuddy-enterprise/values.yaml
@@ -198,28 +198,20 @@ certmanager:
 ## Either enable mysql here, or use your own data_source connection string
 ## in the config block below.
 mysql:
-  enabled: false
-  mysqlRootPassword: ""
-  mysqlUser: ""
-  mysqlPassword: ""
-  mysqlDatabase: buildbuddy
-
-  resources:
-    requests:
-      cpu: "2"
-      memory: "4Gi"
-
-  configurationFiles:
-    mysql.cnf: |-
+  enabled: true
+  auth:
+    rootPassword: ""
+    username: ""
+    password: ""
+    database: buildbuddy
+  primary:
+    # See the preset values in https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
+    resourcesPreset: xlarge
+    configuration: |-
       [mysqld]
       max_connections=4000
-  repository: mysql
-  imageTag: "8.0.18"
-  # metrics:
-  #   enabled: true
-  #   annotations:
-  #     prometheus.io/scrape: "true"
-  #     prometheus.io/port: "9104"
+  secondary:
+    replicaCount: 0
 
 redis:
   enabled: false
@@ -395,7 +387,7 @@ extraVolumeMounts: []
 
 ## Container image that is used to ping mysql until it's up.
 initContainerImage:
-  repository: appropriate/curl
+  repository: busybox
   tag: latest
   imagePullPolicy: IfNotPresent
 
diff --git a/charts/buildbuddy/Chart.yaml b/charts/buildbuddy/Chart.yaml
index 1bf34494..87d1cfb0 100644
--- a/charts/buildbuddy/Chart.yaml
+++ b/charts/buildbuddy/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: BuildBuddy Open Source
 name: buildbuddy
-version: 0.0.233 # Chart version
+version: 0.0.234 # Chart version
 appVersion: 2.65.0 # Version of deployed app
 keywords:
   - buildbuddy
diff --git a/charts/buildbuddy/templates/deployment.yaml b/charts/buildbuddy/templates/deployment.yaml
index 559b32e8..7ecb68ce 100644
--- a/charts/buildbuddy/templates/deployment.yaml
+++ b/charts/buildbuddy/templates/deployment.yaml
@@ -31,7 +31,7 @@ spec:
       - name: "init-mysql"
         image: "{{ .Values.initContainerImage.repository }}:{{ .Values.initContainerImage.tag }}"
         imagePullPolicy: {{ .Values.initContainerImage.imagePullPolicy }}
-        command: ["sh", "-c", "until curl --max-time 10 http://{{ .Release.Name }}-mysql:3306; do echo waiting for {{ .Release.Name }}-mysql; sleep 5; done;"]
+        command: ["sh", "-c", "until nc -z http://{{ .Release.Name }}-mysql 3306; do echo waiting for {{ .Release.Name }}-mysql service; sleep 5; done;"]
       {{- end }}
       {{- if .Values.extraInitContainers }}
       {{- .Values.extraInitContainers | toYaml | nindent 6 }}
diff --git a/charts/buildbuddy/values.yaml b/charts/buildbuddy/values.yaml
index 21caa3c2..35dbe5c6 100644
--- a/charts/buildbuddy/values.yaml
+++ b/charts/buildbuddy/values.yaml
@@ -196,7 +196,7 @@ extraVolumeMounts: []
 
 ## Container image that is used to ping mysql until it's up.
 initContainerImage:
-  repository: appropriate/curl
+  repository: busybox
   tag: latest
   imagePullPolicy: IfNotPresent