diff --git a/apt-sync.py b/apt-sync.py
index b8b533e..2a0ddc8 100755
--- a/apt-sync.py
+++ b/apt-sync.py
@@ -35,9 +35,9 @@ if USE_ADDR_FAMILY != "":
 
 OS_TEMPLATE = {
     "ubuntu-lts": ["focal", "jammy", "noble"],
-    "debian-current": ["bullseye", "bookworm"],
-    "debian-latest2": ["bullseye", "bookworm"],
-    "debian-latest": ["bookworm"],
+    "debian-current": ["bullseye", "bookworm", "trixie"],
+    "debian-latest2": ["bookworm", "trixie"],
+    "debian-latest": ["trixie"],
 }
 ARCH_NO_PKGIDX = ["dep11", "i18n", "cnf"]
 MAX_RETRY = int(os.getenv("MAX_RETRY", "3"))
diff --git a/cvmfs.sh b/cvmfs.sh
index b8e53a0..375f888 100755
--- a/cvmfs.sh
+++ b/cvmfs.sh
@@ -16,7 +16,7 @@ export REPO_SIZE_FILE=/tmp/reposize.$RANDOM
 
 # CERN keeps only maintained versions of CVMFS
 ubuntu_os=(noble jammy focal)
-debian_os=(bookworm bullseye buster)
+debian_os=(trixie bookworm bullseye)
 deb_suffixes=(prod)
 declare -a debian_dists=()
 declare -a ubuntu_dists=()
diff --git a/llvm-apt.sh b/llvm-apt.sh
index 39d6194..f23f26d 100755
--- a/llvm-apt.sh
+++ b/llvm-apt.sh
@@ -17,13 +17,13 @@ function get_codenames() {
     if [ -z "$codenames" ]; then
         echo "Unable to fetch codename from $dist_meta_url, using default" >&2
         prefix=llvm-toolchain-$os
-        codenames="$prefix,$prefix-18,$prefix-19,$prefix-20"
+        codenames="$prefix,$prefix-20,$prefix-21"
     fi
     echo "Codenames for $os: $codenames" >&2
     echo $codenames
 }
 
-for os in "focal" "jammy" "noble" "bullseye" "bookworm"; do
+for os in "focal" "jammy" "noble" "bullseye" "bookworm" "trixie"; do
     codenames=$(get_codenames $os)
     "$apt_sync" --delete "$BASE_URL/$os" "$codenames" main amd64,arm64 "$BASE_PATH/$os"
 done