diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 51a8e5a..90679b9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,22 +45,24 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - distro: centos7
-            playbook: converge.yml
+          # - distro: centos7
+          #   playbook: converge.yml
           - distro: centos8
             playbook: converge.yml
-          - distro: debian9
-            playbook: converge.yml
+          # - distro: debian9
+          #   playbook: converge.yml
           - distro: debian10
             playbook: converge.yml
-          - distro: ubuntu1604
-            playbook: converge.yml
+          # - distro: ubuntu1604
+          #   playbook: converge.yml
           - distro: ubuntu1804
             playbook: converge.yml
           - distro: ubuntu2004
             playbook: converge.yml
           - distro: ubuntu2204
             playbook: converge.yml
+          - distro: ubuntu2404
+            playbook: converge.yml
 
     steps:
       - name: Check out the codebase.
@@ -74,7 +76,7 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies.
-        run: pip3 install ansible molecule[docker] docker
+        run: pip3 install ansible molecule-plugins[docker] docker
         # run: |
         #   pip3 install ansible==6.4.0
         #   pip3 install molecule[docker]==4.0.1
diff --git a/tasks/setup-Debian-family-prerequisites.yml b/tasks/setup-Debian-family-prerequisites.yml
index 1ddff37..a351779 100644
--- a/tasks/setup-Debian-family-prerequisites.yml
+++ b/tasks/setup-Debian-family-prerequisites.yml
@@ -31,7 +31,6 @@
     state: present
 
 - name: Install passlib
-  ansible.builtin.pip:
-    name:
-      - passlib
-  changed_when: false
+  ansible.builtin.apt:
+    name: python3-passlib
+    state: present
diff --git a/tasks/setup-RedHat-family-prerequisites.yml b/tasks/setup-RedHat-family-prerequisites.yml
index f3af510..6a6d044 100644
--- a/tasks/setup-RedHat-family-prerequisites.yml
+++ b/tasks/setup-RedHat-family-prerequisites.yml
@@ -58,7 +58,6 @@
     state: present
 
 - name: Install passlib
-  ansible.builtin.pip:
-    name:
-      - passlib
-  changed_when: false
+  ansible.builtin.yum:
+    name: python3-passlib
+    state: present
diff --git a/vars/Ubuntu-24.yml b/vars/Ubuntu-24.yml
new file mode 100644
index 0000000..1b68a3e
--- /dev/null
+++ b/vars/Ubuntu-24.yml
@@ -0,0 +1,9 @@
+---
+nagios_with_httpd_conf: /etc/apache2/conf-available
+default_nagios_apache_packages:
+  - apache2
+  - php-gd
+  - libgd-dev
+  - libapache2-mod-php
+  - unzip
+default_check_nrpe_package: nagios-nrpe-plugin