diff --git a/charts/mok/Chart.yaml b/charts/mok/Chart.yaml
index 8875c1ebe0820d25eec02c875a8e8045fdf5aa50..643517e6fdf41c5a9b51a67895413e2eb0d36b9d 100644
--- a/charts/mok/Chart.yaml
+++ b/charts/mok/Chart.yaml
@@ -3,7 +3,7 @@ name: mok
 description: |
   Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that runs without a database server on Kubernetes, taking advantage of configmaps and secret.
 type: application
-version: 0.4.1
+version: 0.4.2
 sources:
   - https://de.postfix.org/ftpmirror/index.html
   - https://github.com/dovecot/core
diff --git a/charts/mok/README.md b/charts/mok/README.md
index 7cc0626f7638ef9db5b149012cf62f46595d541b..07d2a8ac8a8dfe91f5d646b1bae4d2a54d08867c 100644
--- a/charts/mok/README.md
+++ b/charts/mok/README.md
@@ -1,6 +1,6 @@
 # mok
 
-![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.4.2](https://img.shields.io/badge/Version-0.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that runs without a database server on Kubernetes, taking advantage of configmaps and secret.
 
diff --git a/charts/mok/templates/dovecot.yaml b/charts/mok/templates/dovecot.yaml
index d15829c1180c905a061360e14570908483df1e4d..95d55ff2d9aa07c6c6dfd0fb1353e0635d40f9bb 100644
--- a/charts/mok/templates/dovecot.yaml
+++ b/charts/mok/templates/dovecot.yaml
@@ -61,7 +61,7 @@ spec:
     matchLabels:
       {{- include "mok.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: dovecot
-  replicas: {{ .Values.postfix.replicaCount }}
+  replicas: {{ .Values.dovecot.replicaCount }}
   strategy:
     type: Recreate
   template:
@@ -138,4 +138,4 @@ spec:
             secretName: {{ include "mok.fullname" . }}-dovecot-users
         - name: tls
           secret:
-            secretName: {{ required "TLS secret for dovecot is required" .Values.postfix.tls.secretName }}
+            secretName: {{ required "TLS secret for dovecot is required" .Values.dovecot.tls.secretName }}
diff --git a/charts/mok/tests/__snapshot__/dovecot_test.yaml.snap b/charts/mok/tests/__snapshot__/dovecot_test.yaml.snap
index 2147e19a5f3b5ed2b26ee6cdb778951eb34926fc..09955b9bfc16fa5113e14fd622c6f1201993039f 100644
--- a/charts/mok/tests/__snapshot__/dovecot_test.yaml.snap
+++ b/charts/mok/tests/__snapshot__/dovecot_test.yaml.snap
@@ -149,7 +149,7 @@ should match snapshot:
               secretName: RELEASE-NAME-mok-dovecot-users
           - name: tls
             secret:
-              secretName: nil
+              secretName: example-tls
   4: |
     apiVersion: v1
     kind: PersistentVolumeClaim
diff --git a/charts/mok/tests/dovecot_test.yaml b/charts/mok/tests/dovecot_test.yaml
index 67282401ab5993d6974f7aae54272a86beffc6df..c170c198ff82611bd6c1da423f2961634878a916 100644
--- a/charts/mok/tests/dovecot_test.yaml
+++ b/charts/mok/tests/dovecot_test.yaml
@@ -117,3 +117,15 @@ tests:
           value: 9215abccdd6c1f21fd329db0133f6f8e892c50aab3dcde3259ea797e8ad2a959
         documentIndex: 2
         template: dovecot.yaml
+  - it: scales with replicaCount
+    set:
+      dovecot:
+        replicaCount: 2
+        tls:
+          secretName: example-tls
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 2
+        documentIndex: 2
+        template: dovecot.yaml
diff --git a/charts/mok/tests/postfix_test.yaml b/charts/mok/tests/postfix_test.yaml
index ffc244931598a829f2b64526c33658a5bf1b0dc6..dbee2ef9f8e5eb44e4798a0e9d7a011e4467faf9 100644
--- a/charts/mok/tests/postfix_test.yaml
+++ b/charts/mok/tests/postfix_test.yaml
@@ -130,3 +130,15 @@ tests:
           apiVersion: policy/v1
           name: test-suite-mok-postfix
         template: postfix.yaml
+  - it: scales with replicaCount
+    set:
+      postfix:
+        replicaCount: 2
+        tls:
+          secretName: example-tls
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 2
+        documentIndex: 1
+        template: postfix.yaml