diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f6af41e..c8108b3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,23 +45,25 @@ 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
+          - distro: rockylinux8
             playbook: converge.yml
+          # - distro: ubuntu1604
+          #   playbook: converge.yml
           - distro: ubuntu1804
             playbook: converge.yml
           - distro: ubuntu2004
             playbook: converge.yml
           - distro: ubuntu2204
             playbook: converge.yml
-          - distro: rockylinux8
+          - distro: ubuntu2404
             playbook: converge.yml
 
     steps:
@@ -76,7 +78,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
 
       - name: Run Molecule tests.
         run: molecule test
diff --git a/tasks/client_macos.yml b/tasks/client_macos.yml
index 8b45757..15b15e6 100644
--- a/tasks/client_macos.yml
+++ b/tasks/client_macos.yml
@@ -77,6 +77,7 @@
 
 - name: Install munin port from macports
   ansible.builtin.shell: |
+    set -o pipefail
     /opt/local/bin/port -N -v install munin | tee /tmp/munin-install.log
   args:
     executable: /bin/bash
diff --git a/tasks/server.yml b/tasks/server.yml
index 30d1b89..0c22eed 100644
--- a/tasks/server.yml
+++ b/tasks/server.yml
@@ -54,10 +54,10 @@
   when: ansible_os_family == 'Debian'
 
 - name: Install passlib
-  ansible.builtin.pip:
+  ansible.builtin.package:
     name:
-      - passlib
-  changed_when: false
+      - python3-passlib
+    state: present
 
 - name: Create cert (Redhat)
   ansible.builtin.shell: "{{ make_dummy_cert_path }} {{ munin_ssl_cert }} ; chmod 640 {{ munin_ssl_cert }} ; chgrp {{ munin_web_user }} {{ munin_ssl_cert }}"
diff --git a/vars/Ubuntu-24.yml b/vars/Ubuntu-24.yml
new file mode 100644
index 0000000..1816477
--- /dev/null
+++ b/vars/Ubuntu-24.yml
@@ -0,0 +1,12 @@
+---
+# server
+munin_packages:
+  - munin
+  - tree
+  - htop
+  - wget
+  - ssl-cert
+  - iputils-ping
+  - net-tools
+  - python3-pip
+  - python3-setuptools