diff --git a/docs/rolereference.rst b/docs/rolereference.rst
index 4bc872cf1a02561608a5953c78cdb86769bab872..508a6d76c727d8f6ab1449d7638d3ab7aeda2d09 100644
--- a/docs/rolereference.rst
+++ b/docs/rolereference.rst
@@ -202,6 +202,7 @@ Distribution compatibility
 Role is compatible with the following distributions:
 
 - Debian 9 (Stretch)
+- Debian 10 (Buster)
 
 
 Examples
diff --git a/roles/bootstrap/meta/main.yml b/roles/bootstrap/meta/main.yml
index 584a3b6e8cabe3b1ba96fef14cbceb5dbf3aecd3..876ba28ddb4b9bc876b959cd9da7163ee754c60c 100644
--- a/roles/bootstrap/meta/main.yml
+++ b/roles/bootstrap/meta/main.yml
@@ -8,5 +8,5 @@ galaxy_info:
   platforms:
     - name: Debian
       versions:
-        - 8
         - 9
+        - 10
diff --git a/roles/bootstrap/molecule/default/molecule.yml b/roles/bootstrap/molecule/default/molecule.yml
index 4cc9e62967ccec0aacb4dca5bc5074c473406319..a6d014cc81cbc894eaa5391fee7b2a764b422d47 100644
--- a/roles/bootstrap/molecule/default/molecule.yml
+++ b/roles/bootstrap/molecule/default/molecule.yml
@@ -28,6 +28,20 @@ platforms:
     memory: 256
     cpus: 1
 
+  - name: parameters-mandatory-buster64
+    groups:
+      - parameters-mandatory
+    box: debian/contrib-buster64
+    memory: 256
+    cpus: 1
+
+  - name: parameters-optional-buster64
+    groups:
+      - parameters-optional
+    box: debian/contrib-buster64
+    memory: 256
+    cpus: 1
+
 provisioner:
   name: ansible
   config_options: