diff --git a/meta/main.yml b/meta/main.yml
index 6af15a1..3564df4 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -11,16 +11,17 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-        - 7
-        - 8
+        - "8"
+        - "9"
     - name: Debian
       versions:
-        - stretch
-        - buster
+        - bullseye
+        - bookworm
     - name: Ubuntu
       versions:
-        - bionic
         - focal
+        - jammy
+        - noble
     - name: ArchLinux
   galaxy_tags:
     - system
diff --git a/molecule/pdns-47/molecule.yml b/molecule/pdns-47/molecule.yml
index 533ca82..d3c1f77 100644
--- a/molecule/pdns-47/molecule.yml
+++ b/molecule/pdns-47/molecule.yml
@@ -10,11 +10,6 @@ dependency:
   name: galaxy
 
 platforms:
-  - name: oraclelinux-7
-    groups: ["pdns"]
-    image: oraclelinux:7
-    dockerfile_tpl: centos-systemd
-
   - name: rockylinux-8
     groups: ["pdns"]
     image: rockylinux:8
@@ -53,9 +48,17 @@ platforms:
       - /tmp
     dockerfile_tpl: debian-systemd
 
-  - name: debian-10
+  - name: ubuntu-2204
+    groups: ["pdns"]
+    image: ubuntu:22.04
+    tmpfs:
+      - /run
+      - /tmp
+    dockerfile_tpl: debian-systemd
+
+  - name: debian-11
     groups: ["pdns"]
-    image: debian:10
+    image: debian:11
     privileged: True
     volume_mounts:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
diff --git a/molecule/pdns-48/molecule.yml b/molecule/pdns-48/molecule.yml
index 4ff1053..afe8330 100644
--- a/molecule/pdns-48/molecule.yml
+++ b/molecule/pdns-48/molecule.yml
@@ -10,11 +10,6 @@ dependency:
   name: galaxy
 
 platforms:
-  - name: oraclelinux-7
-    groups: ["pdns"]
-    image: oraclelinux:7
-    dockerfile_tpl: centos-systemd
-
   - name: rockylinux-8
     groups: ["pdns"]
     image: rockylinux:8
@@ -53,9 +48,30 @@ platforms:
       - /tmp
     dockerfile_tpl: debian-systemd
 
-  - name: debian-10
+  - name: ubuntu-2204
+    groups: ["pdns"]
+    image: ubuntu:22.04
+    tmpfs:
+      - /run
+      - /tmp
+    dockerfile_tpl: debian-systemd
+
+  - name: debian-11
+    groups: ["pdns"]
+    image: debian:11
+    privileged: True
+    volume_mounts:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    tmpfs:
+      - /run
+      - /run/lock
+      - /tmp
+    dockerfile_tpl: debian-systemd
+    environment: { container: docker }
+
+  - name: debian-12
     groups: ["pdns"]
-    image: debian:10
+    image: debian:12
     privileged: True
     volume_mounts:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
diff --git a/molecule/pdns-49/molecule.yml b/molecule/pdns-49/molecule.yml
index a9a4286..db6246e 100644
--- a/molecule/pdns-49/molecule.yml
+++ b/molecule/pdns-49/molecule.yml
@@ -10,11 +10,6 @@ dependency:
   name: galaxy
 
 platforms:
-  - name: oraclelinux-7
-    groups: ["pdns"]
-    image: oraclelinux:7
-    dockerfile_tpl: centos-systemd
-
   - name: rockylinux-8
     groups: ["pdns"]
     image: rockylinux:8
@@ -53,9 +48,38 @@ platforms:
       - /tmp
     dockerfile_tpl: debian-systemd
 
-  - name: debian-10
+  - name: ubuntu-2204
+    groups: ["pdns"]
+    image: ubuntu:22.04
+    tmpfs:
+      - /run
+      - /tmp
+    dockerfile_tpl: debian-systemd
+
+  - name: ubuntu-2404
+    groups: ["pdns"]
+    image: ubuntu:24.04
+    tmpfs:
+      - /run
+      - /tmp
+    dockerfile_tpl: debian-systemd
+
+  - name: debian-11
+    groups: ["pdns"]
+    image: debian:11
+    privileged: True
+    volume_mounts:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    tmpfs:
+      - /run
+      - /run/lock
+      - /tmp
+    dockerfile_tpl: debian-systemd
+    environment: { container: docker }
+
+  - name: debian-12
     groups: ["pdns"]
-    image: debian:10
+    image: debian:12
     privileged: True
     volume_mounts:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
diff --git a/molecule/pdns-master/molecule.yml b/molecule/pdns-master/molecule.yml
index 85321c0..d0ec0f8 100644
--- a/molecule/pdns-master/molecule.yml
+++ b/molecule/pdns-master/molecule.yml
@@ -10,11 +10,6 @@ dependency:
   name: galaxy
 
 platforms:
-  - name: oraclelinux-7
-    groups: ["pdns"]
-    image: oraclelinux:7
-    dockerfile_tpl: centos-systemd
-
   - name: rockylinux-8
     groups: ["pdns"]
     image: rockylinux:8
@@ -53,9 +48,38 @@ platforms:
       - /tmp
     dockerfile_tpl: debian-systemd
 
-  - name: debian-10
+  - name: ubuntu-2204
+    groups: ["pdns"]
+    image: ubuntu:22.04
+    tmpfs:
+      - /run
+      - /tmp
+    dockerfile_tpl: debian-systemd
+
+  - name: ubuntu-2404
+    groups: ["pdns"]
+    image: ubuntu:24.04
+    tmpfs:
+      - /run
+      - /tmp
+    dockerfile_tpl: debian-systemd
+
+  - name: debian-11
+    groups: ["pdns"]
+    image: debian:11
+    privileged: True
+    volume_mounts:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    tmpfs:
+      - /run
+      - /run/lock
+      - /tmp
+    dockerfile_tpl: debian-systemd
+    environment: { container: docker }
+
+  - name: debian-12
     groups: ["pdns"]
-    image: debian:10
+    image: debian:12
     privileged: True
     volume_mounts:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
diff --git a/molecule/pdns-os-repos/molecule.yml b/molecule/pdns-os-repos/molecule.yml
index babf003..9728993 100644
--- a/molecule/pdns-os-repos/molecule.yml
+++ b/molecule/pdns-os-repos/molecule.yml
@@ -10,9 +10,9 @@ dependency:
   name: galaxy
 
 platforms:
-  - name: debian-10
+  - name: debian-11
     groups: ["pdns"]
-    image: debian:10
+    image: debian:11
     privileged: True
     volume_mounts:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
@@ -23,9 +23,9 @@ platforms:
     dockerfile_tpl: debian-systemd
     environment: { container: docker }
 
-  - name: debian-11
+  - name: debian-12
     groups: ["pdns"]
-    image: debian:11
+    image: debian:12
     privileged: True
     volume_mounts:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
@@ -57,6 +57,14 @@ platforms:
       - /tmp
     dockerfile_tpl: debian-systemd
 
+  - name: ubuntu-2404
+    groups: ["pdns"]
+    image: ubuntu:24.04
+    tmpfs:
+      - /run
+      - /tmp
+    dockerfile_tpl: debian-systemd
+
   # In order to run the tests we need
   # a MySQL container to be up & running
   - name: mysql
diff --git a/molecule/systemd-no-overrides/molecule.yml b/molecule/systemd-no-overrides/molecule.yml
index 17d5bcd..1aabfa6 100644
--- a/molecule/systemd-no-overrides/molecule.yml
+++ b/molecule/systemd-no-overrides/molecule.yml
@@ -10,9 +10,9 @@ dependency:
   name: galaxy
 
 platforms:
-  - name: debian-10
+  - name: debian-11
     groups: ["pdns"]
-    image: debian:10
+    image: debian:11
     privileged: True
     volume_mounts:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
@@ -23,6 +23,18 @@ platforms:
     dockerfile_tpl: debian-systemd
     environment: { container: docker }
 
+  - name: debian-12
+    groups: ["pdns"]
+    image: debian:12
+    privileged: True
+    volume_mounts:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    tmpfs:
+      - /run
+      - /run/lock
+      - /tmp
+    dockerfile_tpl: debian-systemd
+    environment: { container: docker }
 
   - name: ubuntu-2004
     groups: ["pdns"]
@@ -32,6 +44,22 @@ platforms:
       - /tmp
     dockerfile_tpl: debian-systemd
 
+  - name: ubuntu-2204
+    groups: ["pdns"]
+    image: ubuntu:22.04
+    tmpfs:
+      - /run
+      - /tmp
+    dockerfile_tpl: debian-systemd
+
+  - name: ubuntu-2404
+    groups: ["pdns"]
+    image: ubuntu:24.04
+    tmpfs:
+      - /run
+      - /tmp
+    dockerfile_tpl: debian-systemd
+
 provisioner:
   name: ansible
   options: