diff --git a/files/Dockerfile b/files/Dockerfile
index 09ae38b..6793aae 100644
--- a/files/Dockerfile
+++ b/files/Dockerfile
@@ -49,7 +49,7 @@ ADD \
   ldap.conf.ext.tmpl \
   submission.conf.tmpl \
   /etc/confd/templates/
-ADD confd.toml /etc/confd/conf.d/
+ADD confd-*.toml /etc/confd/conf.d/
 
 RUN sievec /etc/dovecot/sieve/before/junk-filter.sieve
 
diff --git a/files/confd-auth.toml b/files/confd-auth.toml
new file mode 100644
index 0000000..f7b8a0f
--- /dev/null
+++ b/files/confd-auth.toml
@@ -0,0 +1,10 @@
+[template]
+src = "10-auth.conf.tmpl"
+dest = "/etc/dovecot/local.d/10-auth.conf"
+keys = [
+    "/mail/domains",
+    "/auth/username/format",
+    "/auth/mechanisms",
+    "/auth/master/enable",
+    "/auth/ldap/enable"
+]
diff --git a/files/confd-ldap.toml b/files/confd-ldap.toml
new file mode 100644
index 0000000..492053c
--- /dev/null
+++ b/files/confd-ldap.toml
@@ -0,0 +1,18 @@
+[template]
+src = "ldap.conf.ext.tmpl"
+dest = "/etc/dovecot/local.d/ldap.conf.ext"
+keys = [
+    "/ldap/hosts",
+    "/ldap/uris",
+    "/ldap/bind",
+    "/ldap/version",
+    "/ldap/base",
+    "/ldap/scope",
+    "/ldap/user/attrs",
+    "/ldap/user/filter",
+    "/ldap/pass/attrs",
+    "/ldap/pass/filter",
+    "/ldap/iterate/attrs",
+    "/ldap/iterate/filter",
+    "/ldap/default/pass/scheme",
+]
diff --git a/files/confd-ldap2.toml b/files/confd-ldap2.toml
new file mode 100644
index 0000000..6bb380e
--- /dev/null
+++ b/files/confd-ldap2.toml
@@ -0,0 +1,18 @@
+[template]
+src = "ldap.conf.ext.tmpl"
+dest = "/etc/dovecot/local.d/ldap2.conf.ext"
+keys = [
+    "/ldap/hosts",
+    "/ldap/uris",
+    "/ldap/bind",
+    "/ldap/version",
+    "/ldap/base",
+    "/ldap/scope",
+    "/ldap/user/attrs",
+    "/ldap/user/filter",
+    "/ldap/pass/attrs",
+    "/ldap/pass/filter",
+    "/ldap/iterate/attrs",
+    "/ldap/iterate/filter",
+    "/ldap/default/pass/scheme",
+]
diff --git a/files/confd-lmtp.toml b/files/confd-lmtp.toml
new file mode 100644
index 0000000..5d46a0d
--- /dev/null
+++ b/files/confd-lmtp.toml
@@ -0,0 +1,6 @@
+[template]
+src = "20-lmtp.conf.tmpl"
+dest = "/etc/dovecot/local.d/20-lmtp.conf"
+keys = [
+    "/mail/domains"
+]
diff --git a/files/confd-submission.toml b/files/confd-submission.toml
new file mode 100644
index 0000000..196f8bb
--- /dev/null
+++ b/files/confd-submission.toml
@@ -0,0 +1,15 @@
+[template]
+src = "submission.conf.tmpl"
+dest = "/etc/dovecot/local.d/submission.conf"
+keys = [
+    "/submission/enable",
+    "/submission/relay/host",
+    "/submission/relay/port",
+    "/submission/relay/trusted",
+    "/submission/relay/user",
+    "/submission/relay/master/user",
+    "/submission/relay/password",
+    "/submission/relay/ssl",
+    "/submission/relay/ssl/verify",
+    "/submission/relay/rawlog/dir"
+]
diff --git a/files/confd.toml b/files/confd.toml
deleted file mode 100644
index 5e6692e..0000000
--- a/files/confd.toml
+++ /dev/null
@@ -1,71 +0,0 @@
-[template]
-src = "submission.conf.tmpl"
-dest = "/etc/dovecot/local.d/submission.conf"
-keys = [
-    "/submission/enable",
-    "/submission/relay/host",
-    "/submission/relay/port",
-    "/submission/relay/trusted",
-    "/submission/relay/user",
-    "/submission/relay/master/user",
-    "/submission/relay/password",
-    "/submission/relay/ssl",
-    "/submission/relay/ssl/verify",
-    "/submission/relay/rawlog/dir"
-]
-
-[template]
-src = "10-auth.conf.tmpl"
-dest = "/etc/dovecot/local.d/10-auth.conf"
-keys = [
-    "/mail/domains",
-    "/auth/username/format",
-    "/auth/mechanisms",
-    "/auth/master/enable",
-    "/auth/ldap/enable"
-]
-
-[template]
-src = "20-lmtp.conf.tmpl"
-dest = "/etc/dovecot/local.d/20-lmtp.conf"
-keys = [
-    "/mail/domains"
-]
-
-[template]
-src = "ldap.conf.ext.tmpl"
-dest = "/etc/dovecot/local.d/ldap.conf.ext"
-keys = [
-    "/ldap/hosts",
-    "/ldap/uris",
-    "/ldap/bind",
-    "/ldap/version",
-    "/ldap/base",
-    "/ldap/scope",
-    "/ldap/user/attrs",
-    "/ldap/user/filter",
-    "/ldap/pass/attrs",
-    "/ldap/pass/filter",
-    "/ldap/iterate/attrs",
-    "/ldap/iterate/filter",
-    "/ldap/default/pass/scheme",
-]
-
-[template]
-src = "ldap.conf.ext.tmpl"
-dest = "/etc/dovecot/local.d/ldap2.conf.ext"
-keys = [
-    "/ldap/hosts",
-    "/ldap/uris",
-    "/ldap/bind",
-    "/ldap/version",
-    "/ldap/base",
-    "/ldap/scope",
-    "/ldap/user/attrs",
-    "/ldap/user/filter",
-    "/ldap/pass/attrs",
-    "/ldap/pass/filter",
-    "/ldap/iterate/attrs",
-    "/ldap/iterate/filter",
-    "/ldap/default/pass/scheme",
-]