diff --git a/README.md b/README.md
index 4b5a2d5..5b558b6 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,8 @@ Requirements
 
             * Jessie (8)
             * Stretch (9)
+            * Buster (10)
+            * Bullseye (11)
 
         * Ubuntu
 
diff --git a/meta/main.yml b/meta/main.yml
index 5397163..0deafc9 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -24,6 +24,8 @@ galaxy_info:
       versions:
         - stretch
         - jessie
+        - buster
+        - bullseye
   galaxy_tags:
     - java
     - jdk
diff --git a/molecule/debian-max-java-max-lts-offline/molecule.yml b/molecule/debian-max-java-max-lts-offline/molecule.yml
index e20f5ba..64ce709 100644
--- a/molecule/debian-max-java-max-lts-offline/molecule.yml
+++ b/molecule/debian-max-java-max-lts-offline/molecule.yml
@@ -13,7 +13,7 @@ lint: |
 
 platforms:
   - name: ansible-role-java-debian-max-java-max-lts
-    image: debian:9
+    image: debian:11
     dockerfile: ../default/Dockerfile.j2
 
 provisioner:
diff --git a/molecule/debian-max-java-min-offline/molecule.yml b/molecule/debian-max-java-min-offline/molecule.yml
index 68fd76c..05d0f20 100644
--- a/molecule/debian-max-java-min-offline/molecule.yml
+++ b/molecule/debian-max-java-min-offline/molecule.yml
@@ -13,7 +13,7 @@ lint: |
 
 platforms:
   - name: ansible-role-java-debian-max
-    image: debian:9
+    image: debian:11
     dockerfile: ../default/Dockerfile.j2
 
 provisioner: