diff --git a/docs/rolereference.rst b/docs/rolereference.rst
index 3b9333cc9beb16cdd15217b17612b29a9667eb3e..49e5d80967e1501e4642244539c04914d4e09690 100644
--- a/docs/rolereference.rst
+++ b/docs/rolereference.rst
@@ -2045,10 +2045,6 @@ The role implements the following:
 * Configures MariaDB server and client to use *UTF-8* encoding by default.
 * Sets-up the database root user for passwordless login via UNIX
   socket authentication.
-* Drops the ``debian-sys-maint`` database user (which was used in
-  Debian Jessie and earlier for maintenance tasks) if it is present,
-  and updates the Debian system maintenance configuration file to use
-  the root account over unix socket authentication.
 
 
 Role dependencies
@@ -2071,6 +2067,7 @@ Distribution compatibility
 Role is compatible with the following distributions:
 
 - Debian 10 (Buster)
+- Debian 11 (Bullseye)
 
 
 Examples
diff --git a/roles/database_server/meta/main.yml b/roles/database_server/meta/main.yml
index bf3d690c67c54395bea37acc832e698a0f98bc08..c56fed48133608df8b6848f440f4553d933a768b 100644
--- a/roles/database_server/meta/main.yml
+++ b/roles/database_server/meta/main.yml
@@ -12,3 +12,4 @@ galaxy_info:
     - name: Debian
       versions:
         - 10
+        - 11
diff --git a/roles/database_server/molecule/default/molecule.yml b/roles/database_server/molecule/default/molecule.yml
index 29711edfabd7cc5fef86bd147e392e5934f31a08..149e688a0f7b43ffa6a1a0ccd17d1522af86f3f1 100644
--- a/roles/database_server/molecule/default/molecule.yml
+++ b/roles/database_server/molecule/default/molecule.yml
@@ -21,6 +21,13 @@ platforms:
     memory: 512
     cpus: 1
 
+  - name: parameters-mandatory-bullseye
+    groups:
+      - parameters-mandatory
+    box: debian/bullseye64
+    memory: 512
+    cpus: 1
+
 provisioner:
   name: ansible
   config_options: