diff --git a/bitnami/mysql/Chart.yaml b/bitnami/mysql/Chart.yaml
index cfe075ad7..8fe9efdb0 100644
--- a/bitnami/mysql/Chart.yaml
+++ b/bitnami/mysql/Chart.yaml
@@ -1,5 +1,5 @@
 name: mysql
-version: 4.1.2
+version: 4.2.0
 appVersion: 5.7.24
 description: Chart to create a Highly available MySQL cluster
 keywords:
diff --git a/bitnami/mysql/templates/master-statefulset.yaml b/bitnami/mysql/templates/master-statefulset.yaml
index 57682c1e0..d05988abe 100644
--- a/bitnami/mysql/templates/master-statefulset.yaml
+++ b/bitnami/mysql/templates/master-statefulset.yaml
@@ -26,6 +26,15 @@ spec:
         component: "master"
         release: {{ .Release.Name | quote }}
         heritage: {{ .Release.Service | quote }}
+{{- if or .Values.master.annotations .Values.metrics.enabled }}
+      annotations:
+  {{- if .Values.master.annotations }}
+{{ toYaml .Values.master.annotations | indent 8 }}
+  {{- end }}
+  {{- if .Values.metrics.annotations }}
+{{ toYaml .Values.metrics.annotations | indent 8 }}
+  {{- end }}
+{{- end }}
     spec:
       {{- if .Values.securityContext.enabled }}
       securityContext:
diff --git a/bitnami/mysql/templates/master-svc.yaml b/bitnami/mysql/templates/master-svc.yaml
index f170a8d95..0aabbec27 100644
--- a/bitnami/mysql/templates/master-svc.yaml
+++ b/bitnami/mysql/templates/master-svc.yaml
@@ -8,10 +8,6 @@ metadata:
     chart: {{ template "mysql.chart" . }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
-{{- if .Values.metrics.enabled }}
-  annotations:
-{{ toYaml .Values.metrics.annotations | indent 4 }}
-{{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:
diff --git a/bitnami/mysql/templates/slave-statefulset.yaml b/bitnami/mysql/templates/slave-statefulset.yaml
index b49de33ec..229add4c6 100644
--- a/bitnami/mysql/templates/slave-statefulset.yaml
+++ b/bitnami/mysql/templates/slave-statefulset.yaml
@@ -27,6 +27,15 @@ spec:
         component: "slave"
         release: {{ .Release.Name | quote }}
         heritage: {{ .Release.Service | quote }}
+{{- if or .Values.slave.annotations .Values.metrics.enabled }}
+      annotations:
+  {{- if .Values.slave.annotations }}
+{{ toYaml .Values.slave.annotations | indent 8 }}
+  {{- end }}
+  {{- if .Values.metrics.annotations }}
+{{ toYaml .Values.metrics.annotations | indent 8 }}
+  {{- end }}
+{{- end }}
     spec:
       {{- if .Values.securityContext.enabled }}
       securityContext:
diff --git a/bitnami/mysql/templates/slave-svc.yaml b/bitnami/mysql/templates/slave-svc.yaml
index 78cbb7b63..392712fd0 100644
--- a/bitnami/mysql/templates/slave-svc.yaml
+++ b/bitnami/mysql/templates/slave-svc.yaml
@@ -9,10 +9,6 @@ metadata:
     component: "slave"
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
-{{- if .Values.metrics.enabled }}
-  annotations:
-{{ toYaml .Values.metrics.annotations | indent 4 }}
-{{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:
diff --git a/bitnami/mysql/values-production.yaml b/bitnami/mysql/values-production.yaml
index 66486b23c..b6d45c582 100644
--- a/bitnami/mysql/values-production.yaml
+++ b/bitnami/mysql/values-production.yaml
@@ -243,7 +243,7 @@ slave:
     failureThreshold: 3
 
 metrics:
-  enabled: false
+  enabled: true
   image:
     registry: docker.io
     repository: prom/mysqld-exporter