diff --git a/Dockerfile b/Dockerfile
index 438b908..882d349 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,8 +27,7 @@ RUN apk add --no-cache \
     php7-zip \
     php7-ldap \
     php7-pspell \
-    php7-apcu \
-    dovecot
+    php7-apcu
 
 RUN mkdir /var/lib/roundcube
 RUN wget -qO- https://github.com/roundcube/roundcubemail/releases/download/$VERSION/roundcubemail-$VERSION-complete.tar.gz | tar xz -C /var/lib/roundcube --strip 1
diff --git a/rootfs/etc/confd/conf.d/password-config.inc.php.toml b/rootfs/etc/confd/conf.d/password-config.inc.php.toml
deleted file mode 100644
index 47bc62d..0000000
--- a/rootfs/etc/confd/conf.d/password-config.inc.php.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[template]
-src = "password-config.inc.php.tmpl"
-dest = "/var/lib/roundcube/plugins/password/config.inc.php"
-gid = 101
-uid = 100
-mode = "0660"
diff --git a/rootfs/etc/confd/templates/config.inc.php.tmpl b/rootfs/etc/confd/templates/config.inc.php.tmpl
index 48fcc41..4079669 100644
--- a/rootfs/etc/confd/templates/config.inc.php.tmpl
+++ b/rootfs/etc/confd/templates/config.inc.php.tmpl
@@ -34,7 +34,7 @@ $config['username_domain'] = '%d';
 $config['username_domain_forced'] = true;
 $config['password_charset'] = 'UTF-8';
 
-$config['plugins'] = array('password', 'archive', 'zipdownload');
+$config['plugins'] = array('archive', 'zipdownload');
 
 $config['spellcheck_engine'] = 'pspell';
 $config['default_charset'] = 'UTF-8';
diff --git a/rootfs/etc/confd/templates/password-config.inc.php.tmpl b/rootfs/etc/confd/templates/password-config.inc.php.tmpl
deleted file mode 100644
index eec613d..0000000
--- a/rootfs/etc/confd/templates/password-config.inc.php.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-$config['password_driver'] = 'ldap_simple';
-$config['password_confirm_current'] = true;
-$config['password_require_nonalpha'] = false;
-$config['password_hosts'] = null;
-$config['password_force_save'] = true;
-
-$config['password_algorithm'] = 'dovecot';
-$config['password_dovecotpw'] = '/usr/bin/doveadm pw';
-$config['password_algorithm_prefix'] = '{PBKDF2}';
-$config['password_dovecotpw_method'] = 'PBKDF2';
-
-$config['password_ldap_host'] = '{{getenv "LDAP_HOST"}}';
-$config['password_ldap_port'] = '{{getenv "LDAP_CONNECTION_PORT" "389"}}';
-$config['password_ldap_version'] = '3';
-$config['password_ldap_starttls'] = {{getenv "LDAP_STARTTLS" "true"}};
-$config['password_ldap_basedn'] = '{{getenv "LDAP_BASE_DN"}}';
-$config['password_ldap_method'] = 'user';
-$config['password_ldap_userDN_mask'] = '{{getenv "LDAP_USER_DN_MASK"}}';
-
-$config['password_ldap_encodage'] = 'default';
-$config['password_ldap_pwattr'] = '{{getenv "LDAP_PASSWORD_ATTRIBUTE" "userPassword"}}';
-$config['password_ldap_force_replace'] = true;