diff --git a/dockerfiles/dovecot/Dockerfile b/dockerfiles/dovecot/Dockerfile
new file mode 100644
index 0000000..2141e52
--- /dev/null
+++ b/dockerfiles/dovecot/Dockerfile
@@ -0,0 +1,18 @@
+FROM alpine:latest
+
+RUN apk --no-cache add dovecot dovecot-lmtpd dovecot-submissiond bash
+
+# RUN wget https://github.com/dovecot/docker/blob/main/2.3.21/dovecot.gpg
+# RUN cp dovecot.gpg /etc/apt/keyrings/dovecot.gpg
+
+# RUN wget https://github.com/dovecot/docker/blob/main/2.3.21/dovecot.list
+# RUN cp dovecot.list /etc/apt/sources.list.d
+
+COPY password_file /etc/dovecot/secrets/dovecot_password.file
+COPY dovecot.conf /etc/dovecot/dovecot.conf
+
+EXPOSE 24
+EXPOSE 143
+EXPOSE 993
+
+CMD [ "dovecot", "-F" ]
\ No newline at end of file
diff --git a/dockerfiles/dovecot/dovecot.conf b/dockerfiles/dovecot/dovecot.conf
new file mode 100644
index 0000000..ef59f46
--- /dev/null
+++ b/dockerfiles/dovecot/dovecot.conf
@@ -0,0 +1,48 @@
+## You should mount /etc/dovecot if you want to
+## manage this file
+
+mail_home=/srv/mail/%Lu
+mail_location=sdbox:~/Mail
+mail_uid=1000
+mail_gid=10000
+
+protocols = imap submission lmtp
+
+first_valid_uid = 1000
+last_valid_uid = 10000
+
+# authentication via passwd-file, see https://doc.dovecot.org/configuration_manual/authentication/passwd_file/#authentication-passwd-file
+passdb {
+  driver = passwd-file
+  args = /etc/dovecot/secrets/dovecot_password_file
+}
+
+# post-login user lookup database, see https://doc.dovecot.org/configuration_manual/authentication/user_databases_userdb/#authentication-user-database
+userdb {
+  driver = passwd-file
+  args = /etc/dovecot/secrets/dovecot_password_file
+  default_fields = home=/home/%u
+}
+
+ssl=no
+# ssl_cert=<cert.pem
+# ssl_key=<key.pem
+
+namespace {
+  inbox = yes
+  separator = /
+}
+
+service lmtp {
+  inet_listener {
+    port = 24
+  }
+}
+
+listen = *
+
+log_path=/dev/stdout
+info_log_path=/dev/stdout
+debug_log_path=/dev/stdout
+
+!include_try /etc/dovecot/conf.d/*.conf
\ No newline at end of file
diff --git a/dockerfiles/dovecot/password_file b/dockerfiles/dovecot/password_file
new file mode 100644
index 0000000..a39e466
--- /dev/null
+++ b/dockerfiles/dovecot/password_file
@@ -0,0 +1,2 @@
+user:{plain}password
+user2:{plain}password2
\ No newline at end of file
diff --git a/dockerfiles/postfix/Dockerfile b/dockerfiles/postfix/Dockerfile
new file mode 100644
index 0000000..9c28ad7
--- /dev/null
+++ b/dockerfiles/postfix/Dockerfile
@@ -0,0 +1,14 @@
+FROM alpine:latest
+
+RUN apk --no-cache add postfix bash openssl
+
+COPY startup.sh /usr/bin/startup.sh
+RUN chmod +x /usr/bin/startup.sh
+COPY main.cf /etc/postfix/main.cf
+COPY virtual /etc/postfix/virtual
+
+EXPOSE 25
+EXPOSE 465
+EXPOSE 587
+
+CMD [ "startup.sh" ]
diff --git a/dockerfiles/postfix/main.cf b/dockerfiles/postfix/main.cf
new file mode 100644
index 0000000..f0e9a2b
--- /dev/null
+++ b/dockerfiles/postfix/main.cf
@@ -0,0 +1,14 @@
+# Log everything to standard out
+maillog_file = /dev/stdout
+
+# this setting has several side-effects, e.g. the domain of this mail
+# server is now example.com, http://www.postfix.org/postconf.5.html#mydomain
+myhostname = mail.virt.local
+
+# disable all compatibility levels
+compatibility_level = 9999
+
+virtual_mailbox_domains = main.virt.local
+virtual_mailbox_maps = lmdb:/etc/postfix/virtual
+virtual_alias_maps = lmdb:/etc/postfix/virtual
+virtual_transport = lmtp:dovecot.default.svc.cluster.local:24
\ No newline at end of file
diff --git a/dockerfiles/postfix/startup.sh b/dockerfiles/postfix/startup.sh
new file mode 100644
index 0000000..d8762ce
--- /dev/null
+++ b/dockerfiles/postfix/startup.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ex
+
+postmap /etc/postfix/virtual
+newaliases
+
+exec postfix start-fg
diff --git a/dockerfiles/postfix/virtual b/dockerfiles/postfix/virtual
new file mode 100644
index 0000000..b4f9d28
--- /dev/null
+++ b/dockerfiles/postfix/virtual
@@ -0,0 +1 @@
+@mail.virt.local
\ No newline at end of file
diff --git a/kustomize/dovecat-deployment.yaml b/kustomize/dovecat-deployment.yaml
deleted file mode 100644
index f170cd5..0000000
--- a/kustomize/dovecat-deployment.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dovecat
-  labels:
-    app: dovecat
-spec:
-  replicas: 1
-  revisionHistoryLimit: 0
-  selector:
-    matchLabels:
-      app: dovecat
-      tier: imap
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      app: dovecat
-      tier: imap
-    
\ No newline at end of file
diff --git a/kustomize/dovecat-svc.yaml b/kustomize/dovecat-svc.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/kustomize/dovecat-volume.yaml b/kustomize/dovecat-volume.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/kustomize/dovecot-deployment.yaml b/kustomize/dovecot-deployment.yaml
new file mode 100644
index 0000000..a6f977e
--- /dev/null
+++ b/kustomize/dovecot-deployment.yaml
@@ -0,0 +1,52 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dovecot
+  labels:
+    app: dovecot
+spec:
+  replicas: 1
+  revisionHistoryLimit: 0
+  selector:
+    matchLabels:
+      app: dovecot
+      tier: imap
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      app: dovecat
+      tier: imap
+    spec:
+      containers:
+        - image: git.altarik.fr/quentinlegot/dovecot:latest
+          name: dovecot
+          ports:
+            - containerPort: 24
+              name: lmtp
+            - containerPort: 143
+              name: imap
+            - containerPort: 993
+              name: imaps
+          volumeMounts:
+            - name: dovecot-secrets
+              mountPath: "/etc/dovecot/secrets"
+              readOnly: true
+            - name: dovecot-persistent-storage
+              mountPath: "/home"
+      volumes:
+        - name: dovecot-persistent-storage
+          persistentVolumeClaim:
+            claimName: dovecot-pv-claim
+        - name: dovecot-secrets
+          secret:
+            secretName: dovecot-secrets
+            defaultMode: 292
+
+
+
+
+
+
+
+
diff --git a/kustomize/dovecot-svc.yaml b/kustomize/dovecot-svc.yaml
new file mode 100644
index 0000000..2c5c2d5
--- /dev/null
+++ b/kustomize/dovecot-svc.yaml
@@ -0,0 +1,24 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: dovecot
+  labels:
+    app: dovecot
+spec:
+  ports:
+  - nodePort: 30024
+    port: 24
+    protocol: TCP
+    targetPort: 24
+  - nodePort: 30143
+    port: 143
+    protocol: TCP
+    targetPort: 143
+  - nodePort: 30993
+    port: 993
+    protocol: TCP
+    targetPort: 993
+  selector:
+    app: dovecot
+    tier: imap
+  type: LoadBalancer
\ No newline at end of file
diff --git a/kustomize/dovecot-volume.yaml b/kustomize/dovecot-volume.yaml
new file mode 100644
index 0000000..d21efb8
--- /dev/null
+++ b/kustomize/dovecot-volume.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: dovecot-pv-claim
+  labels:
+    app: dovecot
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
\ No newline at end of file
diff --git a/kustomize/kustomization.yaml b/kustomize/kustomization.yaml
index c9e4d15..5df8511 100644
--- a/kustomize/kustomization.yaml
+++ b/kustomize/kustomization.yaml
@@ -1,8 +1,8 @@
 namePrefix: mail-
 resources:
-  - dovecat-deployment.yaml
-  - dovecat-svc.yaml
-  - dovecat-volume.yaml
+  - dovecot-deployment.yaml
+  - dovecot-svc.yaml
+  - dovecot-volume.yaml
   - postfix-deployment.yaml
   - postfix-svc.yaml