diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 5d94c68..71291a3 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -4,14 +4,16 @@ dependency:
 driver:
   name: docker
 platforms:
-  - name: ubuntu-22.04
-    image: ubuntu:22.04
+  # - name: ubuntu-23.04
+  #   image: ubuntu:23.04
+  # - name: ubuntu-22.04
+  #   image: ubuntu:22.04
   - name: ubuntu-20.04
     image: ubuntu:20.04
+  # - name: debian-12
+  #   image: debian:12
   - name: debian-11
     image: debian:11
-  - name: debian-10
-    image: debian:10
 provisioner:
   name: ansible
   config_options:
diff --git a/molecule/vagrant/molecule.yml b/molecule/vagrant/molecule.yml
index cca985d..d509229 100644
--- a/molecule/vagrant/molecule.yml
+++ b/molecule/vagrant/molecule.yml
@@ -4,6 +4,14 @@ dependency:
 driver:
   name: vagrant
 platforms:
+  # - name: ubuntu-23.04
+  #   box: generic/ubuntu2304
+  #   memory: 4096
+  #   cpus: 2
+  #   provider_options:
+  #     linked_clone: true
+  #   config_options:
+  #     ssh.keep_alive: true
   - name: ubuntu-22.04
     box: generic/ubuntu2204
     memory: 4096
@@ -20,6 +28,22 @@ platforms:
       linked_clone: true
     config_options:
       ssh.keep_alive: true
+  # - name: debian-12
+  #   box: generic/debian12
+  #   memory: 4096
+  #   cpus: 4
+  #   provider_options:
+  #     linked_clone: true
+  #   config_options:
+  #     ssh.keep_alive: true
+  - name: debian-11
+    box: generic/debian11
+    memory: 4096
+    cpus: 4
+    provider_options:
+      linked_clone: true
+    config_options:
+      ssh.keep_alive: true
 provisioner:
   name: ansible
 scenario:
diff --git a/roles/docker_ce/meta/main.yml b/roles/docker_ce/meta/main.yml
index a14f15a..841460d 100644
--- a/roles/docker_ce/meta/main.yml
+++ b/roles/docker_ce/meta/main.yml
@@ -10,7 +10,6 @@ galaxy_info:
     - name: Debian
       versions:
         - bullseye
-        - buster
     - name: Ubuntu
       versions:
         - jammy
diff --git a/roles/docker_compose/meta/main.yml b/roles/docker_compose/meta/main.yml
index cc70a75..80eca2a 100644
--- a/roles/docker_compose/meta/main.yml
+++ b/roles/docker_compose/meta/main.yml
@@ -10,7 +10,6 @@ galaxy_info:
     - name: Debian
       versions:
         - bullseye
-        - buster
     - name: Ubuntu
       versions:
         - jammy