diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a9b99db..3e8cb27 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,13 +42,15 @@ jobs:
           - inspec
         os:
           - amazonlinux-2
-          - ubuntu-1804
           - ubuntu-2004
+          - ubuntu-2204
+          - ubuntu-2404
           - fedora-latest
-          - centos-7
+          - centos-stream-9
           - oraclelinux-7
-          - rockylinux-8
-          - debian-11
+          - oraclelinux-8
+          - oraclelinux-9
+          - rockylinux-9
           - debian-12
           - opensuse-15
           - dockerfile
@@ -73,7 +75,7 @@ jobs:
       matrix:
         suite:
           - capabilities
-        os: [debian-11, ubuntu-1804, ubuntu-2004]
+        os: [ubuntu-2004, ubuntu-2204, ubuntu-2404]
     steps:
       - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@v1
diff --git a/kitchen.yml b/kitchen.yml
index 94bf41e..9199b04 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -14,17 +14,21 @@ provisioner:
 
 platforms:
   - name: amazonlinux-2
-  - name: ubuntu-18.04
   - name: ubuntu-20.04
+  - name: ubuntu-22.04
+  - name: ubuntu-24.04
   - name: fedora-latest
     driver:
       provision_command:
         - yum install libxcrypt-compat -y
         - curl -L https://www.chef.io/chef/install.sh | bash
-  - name: centos-7
+  - name: centos-stream-9
+    driver:
+      image: dokken/centos-stream-9
   - name: oraclelinux-7
-  - name: rockylinux-8
-  - name: debian-11
+  - name: oraclelinux-8
+  - name: oraclelinux-9
+  - name: rockylinux-9
   - name: debian-12
   - name: opensuse-15
     driver:
@@ -42,7 +46,7 @@ suites:
     driver:
       build_context: false
   - name: capabilities
-    includes: [debian-11, ubuntu-18.04, ubuntu-20.04]
+    includes: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
     driver:
       provision_command:
         - curl -L https://www.chef.io/chef/install.sh | bash
diff --git a/test/Dockerfile b/test/Dockerfile
index 645ba42..08a11a9 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -1,6 +1,6 @@
-FROM centos:7
-RUN yum clean all
-RUN yum install -y sudo openssh-server openssh-clients which curl htop
+FROM almalinux:9
+RUN dnf clean all
+RUN dnf install -y sudo openssh-server openssh-clients which curl htop
 RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
 RUN mkdir -p /var/run/sshd
 RUN useradd -d /home/<%= @username %> -m -s /bin/bash <%= @username %>