diff --git a/.github/workflows/daily-jobs.yml b/.github/workflows/daily-jobs.yml
index 3b0e0f2..70050d7 100644
--- a/.github/workflows/daily-jobs.yml
+++ b/.github/workflows/daily-jobs.yml
@@ -16,7 +16,8 @@ jobs:
       matrix:
         branch:
           - sid_amd64
-          - fedora34_x86_64 
+          - fedora38_x86_64
+          - fedora_rawhide_x86_64
 
     env:
       SLUG: "collectd/ci:${{ matrix.branch }}"
diff --git a/.github/workflows/merge-jobs.yml b/.github/workflows/merge-jobs.yml
index 840eaa8..7c83809 100644
--- a/.github/workflows/merge-jobs.yml
+++ b/.github/workflows/merge-jobs.yml
@@ -1,31 +1,27 @@
-name: Merge jobs
+name: Build on Push
 
 on:
   push:
     branches-ignore:
       - main
-        # topic branches (e.g. fix/something)
-      - '**/**'
 
 jobs:
   build_and_publish_container:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Get branch name
+      - uses: actions/checkout@v4
+      - name: Determine container name
         run: |
-          export BRANCH="$(${{ github.ref }} | rev | cut -d '/' -f1 | rev )
-      - run:
-          export SLUG="collectd/ci:${BRANCH}"
+          branch="$(sed -e 's#refs/heads/##' <<<"${{ github.ref }}")"
+          echo "SLUG=collectd/ci:${branch:?}" >>"${GITHUB_ENV}"
       - name: Build container
-        run:
-          docker build --pull -t "${SLUG}" .
-      - run: docker inspect "${SLUG}"
-      - run: docker history "${SLUG}"
+        run: docker build --pull -t "${SLUG:?}" .
+      - run: docker inspect "${SLUG:?}"
+      - run: docker history "${SLUG:?}"
       - run: docker images
       - name: Log into the container registry
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      - run: docker push "${SLUG}"
+      - run: docker push "${SLUG:?}"
diff --git a/.github/workflows/pr-jobs.yml b/.github/workflows/pr-jobs.yml
index 2e3d079..65dd471 100644
--- a/.github/workflows/pr-jobs.yml
+++ b/.github/workflows/pr-jobs.yml
@@ -14,16 +14,24 @@ jobs:
       SLUG: "collectd/ci:test"
       VALGRIND_OPTS: "--errors-for-leak-kinds=definite"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Build container
         run: docker build -t "${SLUG}" .
-      - run: docker inspect "${SLUG}"
+      - name: Inspect container
+        run: docker inspect "${SLUG}"
       - name: Check out the latest verison of collectd
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: collectd/collectd
           ref: main
           path: ${{ github.workspace }}/collectd
+      - name: Create the test container
+        run: |
+          docker run -itd --name collectd-pr-test -v "${GITHUB_WORKSPACE}/collectd:/collectd" -w /collectd "${SLUG}"
       - name: Make sure collectd builds on the container
         run: |
-          docker run -v "${GITHUB_WORKSPACE}/collectd:/collectd" -e VALGRIND_OPTS=${VALGRIND_OPTS} -w /collectd "${SLUG}" bash -c './build.sh && ./configure && make && make check'
+          docker exec -w /collectd collectd-pr-test bash -c './build.sh && ./configure && make -sk'
+      - name: Run collectd unit tests
+        continue-on-error: true
+        run: |
+          docker exec -w /collectd collectd-pr-test make check
diff --git a/.github/workflows/weekly-jobs.yml b/.github/workflows/weekly-jobs.yml
index fbdb156..4b9f383 100644
--- a/.github/workflows/weekly-jobs.yml
+++ b/.github/workflows/weekly-jobs.yml
@@ -15,20 +15,25 @@ jobs:
       matrix:
         branch:
           # Debian
+            # Debian 12
+          - bookworm_amd64
             # Debian 11
           - bullseye_amd64
             # Debian 10
           - buster_amd64
           # Ubuntu
+            # Ubuntu 20.04
+          - focal_amd64
+            # Ubuntu 18.04
+          - bionic_amd64
             # Ubuntu 16.04
           - xenial_amd64
             # Ubuntu 14.04
           - trusty_amd64
           # Fedora
-          - fedora34_x86_64
+          - fedora36_x86_64
           # CentOS
-          - el7_x86_64
-          - el8_x86_64
+          - el9_x86_64
 
     env:
       SLUG: "collectd/ci:${{ matrix.branch }}"