diff --git a/Documentation/SOGoInstallationGuide.asciidoc b/Documentation/SOGoInstallationGuide.asciidoc
index 0a60e71f0..0666bb9b3 100644
--- a/Documentation/SOGoInstallationGuide.asciidoc
+++ b/Documentation/SOGoInstallationGuide.asciidoc
@@ -164,7 +164,7 @@ The following operating systems are currently supported by SOGo:
 
 * Red Hat Enterprise Linux (RHEL) Server 7, 8 and 9
 * Community ENTerprise Operating System (CentOS) 7, 8 and 9
-* Debian GNU/Linux 7.0 (Wheezy), 8.0 (Jessie), 9.0 (Stretch) and 10.0 (Buster)
+* Debian GNU/Linux 7.0 (Wheezy), 8.0 (Jessie), 9.0 (Stretch), 10 (Buster), 11 (Bullseye) and 12 (Bookworm)
 * Ubuntu 14.04 (Trusty), 16.04 (Xenial), 18.04 (Bionic), 20.04 (Focal) and 22.04 (Jammy)
 
 Make sure the required components are started automatically at boot time
diff --git a/Tests/lib/ManageSieve.js b/Tests/lib/ManageSieve.js
index 3f11ef139..11b7a8233 100644
--- a/Tests/lib/ManageSieve.js
+++ b/Tests/lib/ManageSieve.js
@@ -45,6 +45,7 @@ class ManageSieve {
     base64 = buff.toString('base64')
     response = await this.connection.send(`AUTHENTICATE "PLAIN" {${base64.length}+}\r\n${base64}`, { waitfor: /\b(OK|NO)/ })
     // console.debug(`ManageSieve.authenticate => ${response}`)
+    // console.log(`AUTHENTICATE "PLAIN" {${base64.length}+}\r\n${base64}`)
     parsedResponse = this.parseResponse(response)
     if (!Object.keys(parsedResponse).includes('OK')) {
       throw new Error(`Authentication failed: ${parsedResponse['NO']}`)
diff --git a/Tests/spec/SieveSpec.js b/Tests/spec/SieveSpec.js
index ae54e0cb0..2d90fdd44 100644
--- a/Tests/spec/SieveSpec.js
+++ b/Tests/spec/SieveSpec.js
@@ -9,6 +9,7 @@ let prefs, webdav, utility, manageSieve, user
 describe('Sieve', function() {
 
   async function _getSogoSieveScript() {
+    await manageSieve.authenticate(true)
     const scripts = await manageSieve.listScripts()
 
     expect(Object.keys(scripts))
@@ -59,7 +60,6 @@ describe('Sieve', function() {
 
   beforeEach(async function() {
     await _killFilters()
-    await manageSieve.authenticate(true)
   })
 
   afterAll(async function() {
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 7e2912703..56fad435c 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -32,6 +32,11 @@ ifeq ($(DIST_CODENAME), bullseye)
 MFA_CONFIG=--enable-mfa
 endif
 
+# Debian 12
+ifeq ($(DIST_CODENAME), bookworm)
+MFA_CONFIG=--enable-mfa
+endif
+
 # Ubuntu 12.04
 ifeq ($(DIST_CODENAME), precise)
 SODIUM_CONFIG=--disable-sodium