diff --git a/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Authentication b/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Authentication
index 86981e6..7a68b11 100644
--- a/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Authentication
+++ b/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Authentication
@@ -1 +1 @@
-enabled
+disabled
diff --git a/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Authentication b/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Authentication
deleted file mode 100644
index 86981e6..0000000
--- a/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Authentication
+++ /dev/null
@@ -1 +0,0 @@
-enabled
diff --git a/root/etc/e-smith/db/configuration/defaults/uqpsmtpd/Authentication b/root/etc/e-smith/db/configuration/defaults/uqpsmtpd/Authentication
deleted file mode 100644
index 86981e6..0000000
--- a/root/etc/e-smith/db/configuration/defaults/uqpsmtpd/Authentication
+++ /dev/null
@@ -1 +0,0 @@
-enabled
diff --git a/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/06auth_imap b/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/06auth_imap
new file mode 100644
index 0000000..027de6c
--- /dev/null
+++ b/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/06auth_imap
@@ -0,0 +1,5 @@
+{
+    my $auth_smtp = ($qpsmtpd{Authentication} eq 'enabled') ? 'yes' : 'no';
+    return  "# auth/auth_imap disabled " if  $auth_smtp eq "no";
+    $OUT = "auth/auth_imap 127.0.0.1 143";
+}
diff --git a/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/local/06auth_imap b/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/local/06auth_imap
new file mode 100644
index 0000000..027de6c
--- /dev/null
+++ b/root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/local/06auth_imap
@@ -0,0 +1,5 @@
+{
+    my $auth_smtp = ($qpsmtpd{Authentication} eq 'enabled') ? 'yes' : 'no';
+    return  "# auth/auth_imap disabled " if  $auth_smtp eq "no";
+    $OUT = "auth/auth_imap 127.0.0.1 143";
+}
diff --git a/root/usr/lib/systemd/system/sqpsmtpd.service b/root/usr/lib/systemd/system/sqpsmtpd.service
index 4e73e0a..21dcb1e 100644
--- a/root/usr/lib/systemd/system/sqpsmtpd.service
+++ b/root/usr/lib/systemd/system/sqpsmtpd.service
@@ -8,7 +8,7 @@ LimitDATA=150000000
 LimitSTACK=150000000
 LimitMEMLOCK=150000000
 Environment=PORT=465 INSTANCES=40 INSTANCES_PER_IP=5 QPSMTPD_CONFIG=/var/service/sqpsmtpd/config PATH=/var/qmail/bin:/bin:/usr/bin:/usr/local/bin TCPLOCALHOST=me
-WorkingDirectory=/var/service/qpsmtpd/
+WorkingDirectory=/var/service/sqpsmtpd/
 
 ExecStartPre=/sbin/e-smith/service-status qpsmtpd
 ExecStartPre=/sbin/e-smith/systemd/qpsmtpd-init %N
diff --git a/root/usr/lib/systemd/system/uqpsmtpd.service b/root/usr/lib/systemd/system/uqpsmtpd.service
index 2c7908f..9c66078 100644
--- a/root/usr/lib/systemd/system/uqpsmtpd.service
+++ b/root/usr/lib/systemd/system/uqpsmtpd.service
@@ -8,7 +8,7 @@ LimitDATA=150000000
 LimitSTACK=150000000
 LimitMEMLOCK=150000000
 Environment=PORT=587 INSTANCES=40 INSTANCES_PER_IP=5 QPSMTPD_CONFIG=/var/service/uqpsmtpd/config PATH=/var/qmail/bin:/bin:/usr/bin:/usr/local/bin TCPLOCALHOST=me
-WorkingDirectory=/var/service/qpsmtpd/
+WorkingDirectory=/var/service/uqpsmtpd/
 
 ExecStartPre=/sbin/e-smith/service-status uqpsmtpd
 ExecStartPre=/sbin/e-smith/systemd/qpsmtpd-init %N
diff --git a/smeserver-qpsmtpd.spec b/smeserver-qpsmtpd.spec
index b8fcdf2..3e5130f 100644
--- a/smeserver-qpsmtpd.spec
+++ b/smeserver-qpsmtpd.spec
@@ -4,7 +4,7 @@ Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 11.0.0
-%define release 8
+%define release 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -18,7 +18,6 @@ Requires: perl(Mail::DKIM::DkSignature)
 Requires: perl(ClamAV::Client)
 Requires: perl(Mail::DMARC)
 Requires: perl(Net::IMAP::Simple) >= 1.2212
-Requires: daemontools
 Requires: qpsmtpd-plugins >= 0.0.1-sme04
 Requires: ipsvd
 Requires: smeserver-lib >= 1.16.0-08
@@ -47,6 +46,10 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Mon Oct 21 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme
+- fix configuration for auth per deamon [SME: 12451]
+- remove deamontools requirement [SME: 12615]
+
 * Thu Apr 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme
 - add listening deamon on submission port 587 [SME: 6510]
 - move qpsmtpd daemons to full systemd supervision [SME: 12615]
@@ -1083,6 +1086,8 @@ TEMPLATES_DIR=/etc/e-smith/templates/var/service/qpsmtpd/config/peers
 [ -L $TEMPLATES_DIR/local ] && rm -f $TEMPLATES_DIR/local
 [ -L /var/service/sqpsmtpd/config ] && rm -f /var/service/sqpsmtpd/config
 [ -L /var/service/uqpsmtpd/config ] && rm -f /var/service/uqpsmtpd/config
+[ -L /etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/06auth_imap ] && rm -f /etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/06auth_imap
+[ -L /etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/06auth_imap ] && rm -f /etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/06auth_imap
 true
 
 %post