diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index ea12ae4..ecdd48b 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -18,11 +18,13 @@ jobs:
           - debian-10
           - debian-11
           - debian-12
+          - ubuntu-20.04
           - ubuntu-22.04
+          - ubuntu-24.04
         allowed-to-fail:
           - false
         include:
-          - scenario: ubuntu-20.04
+          - scenario: debian-13
             allowed-to-fail: true
 
     steps:
diff --git a/README.md b/README.md
index 00dd1b6..8abff25 100644
--- a/README.md
+++ b/README.md
@@ -26,9 +26,11 @@ Supported OS:
 | Debian Stretch (9)   | Yes     | Check latest supported version ([1.9.0](https://github.com/HanXHX/ansible-nginx/releases/tag/1.9.0)) | 
 | Debian Buster (10)   | Yes     | Yes                                                                                                  |
 | Debian Bullseye (11) | Yes     | Yes                                                                                                  |
-| Debian Bookworm (12) | Yes     | Not yet :)                                                                                           |
+| Debian Bookworm (12) | Yes     | Yes                                                                                                  |
+| Debian Trixie (13)   | WIP     | Not yet                                                                                              |
 | Ubuntu 20.04         | Yes     | Yes                                                                                                  |
 | Ubuntu 22.04         | Yes     | Yes                                                                                                  |
+| Ubuntu 24.04         | Yes     | Yes                                                                                                  |
 
 Requirements
 ------------
diff --git a/molecule/debian-12/molecule.yml b/molecule/debian-12/molecule.yml
index 6d4e51f..18d1680 100644
--- a/molecule/debian-12/molecule.yml
+++ b/molecule/debian-12/molecule.yml
@@ -1,8 +1,8 @@
 ---
 
 platforms:
-  - name: debian-12
-    image: dokken/debian-12
+  - name: debian-13
+    image: dokken/debian-13
     command: /lib/systemd/systemd
     dockerfile: ../_shared/Dockerfile.j2
     capabilities:
diff --git a/molecule/debian-13/molecule.yml b/molecule/debian-13/molecule.yml
new file mode 100644
index 0000000..058273c
--- /dev/null
+++ b/molecule/debian-13/molecule.yml
@@ -0,0 +1,13 @@
+---
+
+platforms:
+  - name: debian-12
+    image: dokken/debian-13
+    command: /lib/systemd/systemd
+    dockerfile: ../_shared/Dockerfile.j2
+    capabilities:
+      - SYS_ADMIN
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    privileged: true
diff --git a/molecule/ubuntu-24.04/molecule.yml b/molecule/ubuntu-24.04/molecule.yml
new file mode 100644
index 0000000..0a569eb
--- /dev/null
+++ b/molecule/ubuntu-24.04/molecule.yml
@@ -0,0 +1,13 @@
+---
+
+platforms:
+  - name: ubuntu-24.04
+    image: dokken/ubuntu-24.04
+    command: /lib/systemd/systemd
+    dockerfile: ../_shared/Dockerfile.j2
+    capabilities:
+      - SYS_ADMIN
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    privileged: true