diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4aa420d3f5..33fc02d5ad 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,8 +23,8 @@ parameters:
         --disable-stack-protector \
         --with-persistent-storage \
   build-pkgs:
-    type: string
-    default: ""
+    type: boolean
+    default: false
 
 jobs:
   dist:
@@ -231,16 +231,16 @@ jobs:
             case "<< parameters.dist >>" in
             almalinux|fedora)
                 case "<< parameters.dist >>:<< parameters.release >>" in
-                    almalinux:9)
+                    almalinux:8)
                         dnf -y install "dnf-command(config-manager)"
-                        dnf config-manager --set-enabled crb
+                        dnf config-manager --set-enabled powertools
                         dnf -y install diffutils
                         dnf -y install epel-release
                         dnf -y groupinstall "Development Tools"
                         ;;
-                    almalinux:8)
+                    almalinux:*)
                         dnf -y install "dnf-command(config-manager)"
-                        dnf config-manager --set-enabled powertools
+                        dnf config-manager --set-enabled crb
                         dnf -y install diffutils
                         dnf -y install epel-release
                         dnf -y groupinstall "Development Tools"
@@ -433,12 +433,13 @@ workflows:
           matrix:
             parameters:
               platform:
-                - ubuntu:focal
                 - ubuntu:jammy
                 - ubuntu:noble
                 - debian:bookworm
+                - debian:trixie
                 - almalinux:8
                 - almalinux:9
+                - almalinux:10
                 - fedora:latest
                 - alpine:latest
               rclass:
diff --git a/.circleci/make-rpm-packages.sh b/.circleci/make-rpm-packages.sh
index 4a9f8a1423..61d0914e51 100755
--- a/.circleci/make-rpm-packages.sh
+++ b/.circleci/make-rpm-packages.sh
@@ -14,14 +14,14 @@ elif [ -z "$PARAM_DIST" ]; then
 fi
 
 case "$PARAM_DIST:$PARAM_RELEASE" in
-    almalinux:9)
+    almalinux:8)
         dnf -y install 'dnf-command(config-manager)'
-        dnf config-manager --set-enabled crb
+        dnf config-manager --set-enabled powertools
         dnf -y install epel-release
         ;;
-    almalinux:8)
+    almalinux:*)
         dnf -y install 'dnf-command(config-manager)'
-        dnf config-manager --set-enabled powertools
+        dnf config-manager --set-enabled crb
         dnf -y install epel-release
         ;;
 esac