diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fac68d9..e41f4b1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,11 +60,12 @@ jobs:
         container:
           - ubuntu:22.04
           - ubuntu:20.04
+          - debian:bookworm
           - debian:bullseye
-          - debian:buster
+          - rockylinux:9
           - rockylinux:8
-          - fedora:36
-          - fedora:35
+          - fedora:39
+          - fedora:38
 
     container:
       image: ${{ matrix.container }}
@@ -122,8 +123,8 @@ jobs:
           ./build/s3fsawscred_test | grep -v '[E|e]xpiration' | sed -e "s/Version .*$/Version/g" > /tmp/s3fsawscred_test.result
           diff .github/workflows/s3fsawscred_test.result /tmp/s3fsawscred_test.result
 
-  macos11:
-    runs-on: macos-11
+  macos12:
+    runs-on: macos-12
 
     steps:
       - name: Checkout source code
diff --git a/.github/workflows/linux-ci-helper.sh b/.github/workflows/linux-ci-helper.sh
index 16d36ac..ad43811 100755
--- a/.github/workflows/linux-ci-helper.sh
+++ b/.github/workflows/linux-ci-helper.sh
@@ -59,6 +59,13 @@ elif [ "${CONTAINER_FULLNAME}" = "ubuntu:18.04" ]; then
 	INSTALL_PACKAGES="git g++ cmake libcurl4-openssl-dev libssl-dev uuid-dev zlib1g-dev libpulse-dev"
 	INSTALL_REPO_OPTIONS=""
 
+elif [ "${CONTAINER_FULLNAME}" = "debian:bookworm" ]; then
+	PACKAGE_MANAGER_BIN="apt-get"
+	PACKAGE_UPDATE_OPTIONS="update -y -qq"
+
+	INSTALL_PACKAGES="git g++ cmake libcurl4-openssl-dev libssl-dev uuid-dev zlib1g-dev libpulse-dev"
+	INSTALL_REPO_OPTIONS=""
+
 elif [ "${CONTAINER_FULLNAME}" = "debian:bullseye" ]; then
 	PACKAGE_MANAGER_BIN="apt-get"
 	PACKAGE_UPDATE_OPTIONS="update -y -qq"
@@ -80,6 +87,13 @@ elif [ "${CONTAINER_FULLNAME}" = "debian:stretch" ]; then
 	INSTALL_PACKAGES="git g++ cmake libcurl4-openssl-dev libssl-dev uuid-dev zlib1g-dev libpulse-dev"
 	INSTALL_REPO_OPTIONS=""
 
+elif [ "${CONTAINER_FULLNAME}" = "rockylinux:9" ]; then
+	PACKAGE_MANAGER_BIN="dnf"
+	PACKAGE_UPDATE_OPTIONS="update -y -qq"
+
+	INSTALL_PACKAGES="git gcc-c++ cmake libcurl-devel openssl-devel uuid-devel zlib-devel pulseaudio-libs-devel diffutils"
+	INSTALL_REPO_OPTIONS="--enablerepo=crb"
+
 elif [ "${CONTAINER_FULLNAME}" = "rockylinux:8" ]; then
 	PACKAGE_MANAGER_BIN="dnf"
 	PACKAGE_UPDATE_OPTIONS="update -y -qq"
@@ -94,6 +108,27 @@ elif [ "${CONTAINER_FULLNAME}" = "centos:centos7" ]; then
 	INSTALL_PACKAGES="git gcc-c++ cmake libcurl-devel openssl-devel uuid-devel zlib-devel pulseaudio-libs-devel"
 	INSTALL_REPO_OPTIONS=""
 
+elif [ "${CONTAINER_FULLNAME}" = "fedora:39" ]; then
+	PACKAGE_MANAGER_BIN="dnf"
+	PACKAGE_UPDATE_OPTIONS="update -y -qq"
+
+	INSTALL_PACKAGES="git gcc-c++ cmake libcurl-devel openssl-devel uuid-devel zlib-devel pulseaudio-libs-devel diffutils"
+	INSTALL_REPO_OPTIONS=""
+
+elif [ "${CONTAINER_FULLNAME}" = "fedora:38" ]; then
+	PACKAGE_MANAGER_BIN="dnf"
+	PACKAGE_UPDATE_OPTIONS="update -y -qq"
+
+	INSTALL_PACKAGES="git gcc-c++ cmake libcurl-devel openssl-devel uuid-devel zlib-devel pulseaudio-libs-devel diffutils"
+	INSTALL_REPO_OPTIONS=""
+
+elif [ "${CONTAINER_FULLNAME}" = "fedora:37" ]; then
+	PACKAGE_MANAGER_BIN="dnf"
+	PACKAGE_UPDATE_OPTIONS="update -y -qq"
+
+	INSTALL_PACKAGES="git gcc-c++ cmake libcurl-devel openssl-devel uuid-devel zlib-devel pulseaudio-libs-devel diffutils"
+	INSTALL_REPO_OPTIONS=""
+
 elif [ "${CONTAINER_FULLNAME}" = "fedora:36" ]; then
 	PACKAGE_MANAGER_BIN="dnf"
 	PACKAGE_UPDATE_OPTIONS="update -y -qq"