diff --git a/docs/rolereference.rst b/docs/rolereference.rst
index 7de243beeb004f02832ee46ec6c8ceaa08e937b3..0a762d6d44ea916ea46f63f7852692248d1c0181 100644
--- a/docs/rolereference.rst
+++ b/docs/rolereference.rst
@@ -778,6 +778,7 @@ Distribution compatibility
 Role is compatible with the following distributions:
 
 - Debian 9 (Stretch)
+- Debian 10 (Buster)
 
 
 Examples
diff --git a/roles/ldap_server/meta/main.yml b/roles/ldap_server/meta/main.yml
index fa54f6eda22594470846bb18c782aceba69fef83..5c376a29bedc9fc7b45a465f417199f0f0cef43f 100644
--- a/roles/ldap_server/meta/main.yml
+++ b/roles/ldap_server/meta/main.yml
@@ -17,5 +17,5 @@ galaxy_info:
   platforms:
     - name: Debian
       versions:
-        - 8
         - 9
+        - 10
diff --git a/roles/ldap_server/molecule/default/molecule.yml b/roles/ldap_server/molecule/default/molecule.yml
index 681b9238eacd0e73db72212b23c4eecc77450f31..1051a99ebbdcea5ad620cf32cf3472c04dc48d0d 100644
--- a/roles/ldap_server/molecule/default/molecule.yml
+++ b/roles/ldap_server/molecule/default/molecule.yml
@@ -15,7 +15,7 @@ lint:
 platforms:
 
   - name: client
-    box: debian/contrib-stretch64
+    box: debian/contrib-buster64
     memory: 512
     cpus: 1
     interfaces:
@@ -49,6 +49,31 @@ platforms:
         network_name: private_network
         type: static
 
+  - name: parameters-mandatory-buster64
+    groups:
+      - parameters-mandatory
+    box: debian/contrib-buster64
+    memory: 256
+    cpus: 1
+    interfaces:
+      - auto_config: true
+        ip: 10.31.127.12
+        network_name: private_network
+        type: static
+
+  - name: parameters-optional-buster64
+    groups:
+      - parameters-optional
+      - backup-server
+    box: debian/contrib-buster64
+    memory: 256
+    cpus: 1
+    interfaces:
+      - auto_config: true
+        ip: 10.31.127.13
+        network_name: private_network
+        type: static
+
 provisioner:
   name: ansible
   playbooks:
diff --git a/roles/ldap_server/molecule/default/prepare.yml b/roles/ldap_server/molecule/default/prepare.yml
index 4a8e9c7c69e30a6a672665d62896646fef78231e..c0314a3f4b4ac04a092581d82645d159c1606788 100644
--- a/roles/ldap_server/molecule/default/prepare.yml
+++ b/roles/ldap_server/molecule/default/prepare.yml
@@ -27,6 +27,10 @@
           fqdn: parameters-mandatory
         - name: parameters-optional-stretch64_ldap
           fqdn: parameters-optional
+        - name: parameters-mandatory-buster64_ldap
+          fqdn: parameters-mandatory
+        - name: parameters-optional-buster64_ldap
+          fqdn: parameters-optional
 
     - name: Set-up link to generated X.509 material
       file:
@@ -81,6 +85,8 @@
       with_dict:
         10.31.127.22: parameters-mandatory-stretch64
         10.31.127.23: parameters-optional-stretch64
+        10.31.127.12: parameters-mandatory-buster64
+        10.31.127.13: parameters-optional-buster64
 
 - hosts: parameters-optional
   become: true