diff --git a/githubactions-dovecot/Dockerfile b/githubactions-dovecot/Dockerfile
index c8018abf..f3c451ae 100644
--- a/githubactions-dovecot/Dockerfile
+++ b/githubactions-dovecot/Dockerfile
@@ -9,6 +9,7 @@ LABEL \
 # Create glpi user and its home directory
 RUN groupadd --gid 1000 glpi
 RUN useradd --create-home --home-dir /home/glpi --gid 1000 --uid 1000 glpi
+RUN usermod --append --groups mail glpi
 
 RUN \
   # Clean APT sources list to prevent packages list update error:
diff --git a/githubactions-dovecot/files/etc/dovecot/local.conf b/githubactions-dovecot/files/etc/dovecot/local.conf
index e45816a6..f70623bf 100644
--- a/githubactions-dovecot/files/etc/dovecot/local.conf
+++ b/githubactions-dovecot/files/etc/dovecot/local.conf
@@ -1,13 +1,12 @@
-disable_plaintext_auth = no
-mail_location = maildir:/home/glpi/Maildir
+auth_allow_cleartext = yes
+mail_driver = maildir
+mail_path = /home/glpi/Maildir
+mail_inbox_path = /home/glpi/Maildir
 mail_max_userip_connections = 10000
 
-passdb {
-  driver = passwd-file
-  args = /etc/dovecot/passwd
+passdb passwd-file {
+  passwd_file_path = /etc/dovecot/passwd
 }
-userdb {
-  driver = static
-  # 1000 is uid/gid of glpi user
-  args = uid=1000 gid=1000 home=/home/glpi
+userdb passwd-file {
+  passwd_file_path = /etc/dovecot/passwd
 }
diff --git a/githubactions-dovecot/files/etc/dovecot/passwd b/githubactions-dovecot/files/etc/dovecot/passwd
index d88973e5..7a1dd29d 100644
--- a/githubactions-dovecot/files/etc/dovecot/passwd
+++ b/githubactions-dovecot/files/etc/dovecot/passwd
@@ -1 +1 @@
-testuser:{plain}applesauce
+testuser:{plain}applesauce:1000:1000::/home/glpi::