diff --git a/.ci/install-dependencies.sh b/.ci/install-dependencies.sh
index c10ddb6eacc..9b031c98cda 100755
--- a/.ci/install-dependencies.sh
+++ b/.ci/install-dependencies.sh
@@ -7,7 +7,7 @@
 
 j=-j`nproc` || j=
 type sudo >/dev/null 2>&1 && sudo=sudo || sudo=
-common_packages='make libssl-dev libpcap-dev'
+common_packages='make libcrypt-dev libssl-dev libpcap-dev'
 
 retry_if_failed()
 {
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index af691050e42..f2b35fee3e8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,23 +35,30 @@ jobs:
           - { cc: gcc, runs_on: ubuntu-latest, target: x86_64, variant: asan-sse2 }
           - { cc: gcc, runs_on: ubuntu-latest, target: x86_64, variant: asan-avx }
           - { cc: gcc, runs_on: ubuntu-latest, target: x86_64, variant: asan-avx2 }
-          # GCC 9–15 (ubuntu-latest)
+          # GCC 11–16 (ubuntu-latest)
+          - { cc: gcc-16, runs_on: ubuntu-latest, target: x86_64, variant: base }
+          - { cc: gcc-16, runs_on: ubuntu-latest, target: x86, variant: without-openssl }
+          - { cc: gcc-16, runs_on: ubuntu-latest, target: x86, variant: disable-all }
           - { cc: gcc-15, runs_on: ubuntu-latest, target: x86_64, variant: base }
-          - { cc: gcc-15, runs_on: ubuntu-latest, target: x86, variant: without-openssl }
-          - { cc: gcc-15, runs_on: ubuntu-latest, target: x86, variant: disable-all }
           - { cc: gcc-14, runs_on: ubuntu-latest, target: x86_64, variant: base }
           - { cc: gcc-13, runs_on: ubuntu-latest, target: x86_64, variant: base }
           - { cc: gcc-12, runs_on: ubuntu-latest, target: x86_64, variant: base }
           - { cc: gcc-11, runs_on: ubuntu-latest, target: x86_64, variant: base }
-          - { cc: gcc-10, runs_on: ubuntu-latest, target: x86_64, variant: base }
-          - { cc: gcc-9, runs_on: ubuntu-latest, target: x86_64, variant: base }
-          # Clang 14–19 (ubuntu-latest)
+          # GCC 9–10 (ubuntu-24.04)
+          - { cc: gcc-10, runs_on: ubuntu-24.04, target: x86_64, variant: base }
+          - { cc: gcc-9, runs_on: ubuntu-24.04, target: x86_64, variant: base }
+          # Clang 21–22 (ubuntu-26.04)
+          - { cc: clang-22, runs_on: ubuntu-26.04, target: x86_64, variant: base }
+          - { cc: clang-21, runs_on: ubuntu-26.04, target: x86_64, variant: base }
+          # Clang 17–20 (ubuntu-latest)
+          - { cc: clang-20, runs_on: ubuntu-latest, target: x86_64, variant: base }
           - { cc: clang-19, runs_on: ubuntu-latest, target: x86_64, variant: base }
           - { cc: clang-18, runs_on: ubuntu-latest, target: x86_64, variant: base }
           - { cc: clang-17, runs_on: ubuntu-latest, target: x86_64, variant: base }
-          - { cc: clang-16, runs_on: ubuntu-latest, target: x86_64, variant: base }
-          - { cc: clang-15, runs_on: ubuntu-latest, target: x86_64, variant: base }
-          - { cc: clang-14, runs_on: ubuntu-latest, target: x86_64, variant: base }
+          # Clang 14–16 (ubuntu-24.04)
+          - { cc: clang-16, runs_on: ubuntu-24.04, target: x86_64, variant: base }
+          - { cc: clang-15, runs_on: ubuntu-24.04, target: x86_64, variant: base }
+          - { cc: clang-14, runs_on: ubuntu-24.04, target: x86_64, variant: base }
           # Clang 11–13 (ubuntu-22.04)
           - { cc: clang-13, runs_on: ubuntu-22.04, target: x86_64, variant: base }
           - { cc: clang-12, runs_on: ubuntu-22.04, target: x86_64, variant: base }