diff --git a/.github/workflows/on-push-lint-charts.yml b/.github/workflows/on-push-lint-charts.yml
index e68538f..42b304b 100644
--- a/.github/workflows/on-push-lint-charts.yml
+++ b/.github/workflows/on-push-lint-charts.yml
@@ -13,7 +13,7 @@ on:
 
 env:
   KUBE_SCORE_VERSION: 1.17.0
-  HELM_VERSION: v3.13.2
+  HELM_VERSION: v3.19.0
 
 concurrency:
   group: ${{ github.ref }}
@@ -29,7 +29,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@v4.3.0
         with:
           version: ${{ env.HELM_VERSION }}
 
@@ -64,7 +64,7 @@ jobs:
     strategy:
       matrix:
         # Choose from https://hub.docker.com/r/kindest/node/tags
-        KubeVersion: [ 1.30.10, 1.31.6, 1.32.2]
+        KubeVersion: [ 1.32.8, 1.33.4, 1.34.0]
 
     steps:
       - name: Checkout
diff --git a/TESTING.md b/TESTING.md
index 42c8a16..08c61cd 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -34,9 +34,6 @@ To run locally:
 
 *ct* can also test a chart by deploying it to a temporary namespace in a Kubernetes cluster, and waiting for indications that the deployment has been successful. This is a good way to test how the deployment behaves "for real".
 
-
-
-
 ct lint --config=.ci/ct-config.yaml
 
 Create a KinD cluster, by running `kind create cluster`:
diff --git a/charts/docker-mailserver/Chart.yaml b/charts/docker-mailserver/Chart.yaml
index e859720..c51cce4 100644
--- a/charts/docker-mailserver/Chart.yaml
+++ b/charts/docker-mailserver/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "15.0.2"
+appVersion: "15.1.0"
 description: A fullstack but simple mailserver (smtp, imap, antispam, antivirus, ssl...) using Docker.
 name: docker-mailserver
-version: 5.0.0
+version: 5.1.0
 sources:
 - https://github.com/docker-mailserver/docker-mailserver-helm
 maintainers:
diff --git a/charts/docker-mailserver/README.md b/charts/docker-mailserver/README.md
index 4bbd5a1..229ed73 100644
--- a/charts/docker-mailserver/README.md
+++ b/charts/docker-mailserver/README.md
@@ -296,7 +296,7 @@ DMS does not use techniques such as permissive initial directory creation that i
 Quirks from the generic section also apply to NFS-backed PersistentVolumes.
 
 ## Upgrading to Version 5
-Version 5.0 upgrades docker-mailserver to version 15. This version of the chart *does* include backwards incompatible changes
+Version 5.0 of the chart *does* include backwards incompatible changes.
 
 ### PersistentVolumeClaims
 
diff --git a/charts/docker-mailserver/templates/deployment.yaml b/charts/docker-mailserver/templates/deployment.yaml
index aa9445d..311aeba 100644
--- a/charts/docker-mailserver/templates/deployment.yaml
+++ b/charts/docker-mailserver/templates/deployment.yaml
@@ -272,7 +272,7 @@ spec:
 
           ports:
             - containerPort: 9154
-              name: http
+              name: metrics
               protocol: TCP
           resources:
 {{ toYaml .Values.metrics.resources | indent 12 }}
diff --git a/charts/docker-mailserver/templates/service.yaml b/charts/docker-mailserver/templates/service.yaml
index eac6ff7..7c7861f 100644
--- a/charts/docker-mailserver/templates/service.yaml
+++ b/charts/docker-mailserver/templates/service.yaml
@@ -137,8 +137,8 @@ spec:
  
   {{- if .Values.metrics.enabled }}
     - name: metrics
-      port: 9154
-      targetPort: 9154       
+      port: {{ .Values.monitoring.service.port }}
+      targetPort: metrics       
   {{- end }}
 
   type: {{ default "ClusterIP" .Values.service.type }}
diff --git a/charts/docker-mailserver/tests/__snapshot__/configmap_test.yaml.snap b/charts/docker-mailserver/tests/__snapshot__/configmap_test.yaml.snap
index cca8d4b..e8bf0c9 100644
--- a/charts/docker-mailserver/tests/__snapshot__/configmap_test.yaml.snap
+++ b/charts/docker-mailserver/tests/__snapshot__/configmap_test.yaml.snap
@@ -2,7 +2,7 @@ manifest should match snapshot:
   1: |
     apiVersion: v1
     data:
-      dovecot.cf: |2
+      dovecot.cf: |
         haproxy_trusted_networks = 10.0.0.0/8 192.168.0.0/16 172.16.0.0/12
         service imap-login {
             inet_listener imap {