diff --git a/13/bullseye/Dockerfile b/13/trixie/Dockerfile
similarity index 98%
rename from 13/bullseye/Dockerfile
rename to 13/trixie/Dockerfile
index b914b71ff0..4a7d010e1f 100644
--- a/13/bullseye/Dockerfile
+++ b/13/trixie/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 # explicitly set user/group IDs
 RUN set -eux; \
@@ -89,7 +89,7 @@ RUN set -ex; \
 ENV PG_MAJOR 13
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 13.21-1.pgdg110+1
+ENV PG_VERSION 13.21-1.pgdg130+1
 
 RUN set -ex; \
 	\
@@ -97,7 +97,7 @@ RUN set -ex; \
 	export PYTHONDONTWRITEBYTECODE=1; \
 	\
 	dpkgArch="$(dpkg --print-architecture)"; \
-	aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR"; \
+	aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \
 	case "$dpkgArch" in \
 		amd64 | arm64 | ppc64el) \
 # arches officialy built by upstream
diff --git a/13/bullseye/docker-ensure-initdb.sh b/13/trixie/docker-ensure-initdb.sh
similarity index 100%
rename from 13/bullseye/docker-ensure-initdb.sh
rename to 13/trixie/docker-ensure-initdb.sh
diff --git a/13/bullseye/docker-entrypoint.sh b/13/trixie/docker-entrypoint.sh
similarity index 100%
rename from 13/bullseye/docker-entrypoint.sh
rename to 13/trixie/docker-entrypoint.sh
diff --git a/14/bullseye/Dockerfile b/14/trixie/Dockerfile
similarity index 98%
rename from 14/bullseye/Dockerfile
rename to 14/trixie/Dockerfile
index ff863ef774..7ac52e4325 100644
--- a/14/bullseye/Dockerfile
+++ b/14/trixie/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 # explicitly set user/group IDs
 RUN set -eux; \
@@ -89,7 +89,7 @@ RUN set -ex; \
 ENV PG_MAJOR 14
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 14.18-1.pgdg110+1
+ENV PG_VERSION 14.18-1.pgdg130+1
 
 RUN set -ex; \
 	\
@@ -97,7 +97,7 @@ RUN set -ex; \
 	export PYTHONDONTWRITEBYTECODE=1; \
 	\
 	dpkgArch="$(dpkg --print-architecture)"; \
-	aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR"; \
+	aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \
 	case "$dpkgArch" in \
 		amd64 | arm64 | ppc64el) \
 # arches officialy built by upstream
diff --git a/14/bullseye/docker-ensure-initdb.sh b/14/trixie/docker-ensure-initdb.sh
similarity index 100%
rename from 14/bullseye/docker-ensure-initdb.sh
rename to 14/trixie/docker-ensure-initdb.sh
diff --git a/14/bullseye/docker-entrypoint.sh b/14/trixie/docker-entrypoint.sh
similarity index 100%
rename from 14/bullseye/docker-entrypoint.sh
rename to 14/trixie/docker-entrypoint.sh
diff --git a/15/bullseye/Dockerfile b/15/trixie/Dockerfile
similarity index 98%
rename from 15/bullseye/Dockerfile
rename to 15/trixie/Dockerfile
index ec325d7c88..53766659d2 100644
--- a/15/bullseye/Dockerfile
+++ b/15/trixie/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 # explicitly set user/group IDs
 RUN set -eux; \
@@ -89,7 +89,7 @@ RUN set -ex; \
 ENV PG_MAJOR 15
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 15.13-1.pgdg110+1
+ENV PG_VERSION 15.13-1.pgdg130+1
 
 RUN set -ex; \
 	\
@@ -97,7 +97,7 @@ RUN set -ex; \
 	export PYTHONDONTWRITEBYTECODE=1; \
 	\
 	dpkgArch="$(dpkg --print-architecture)"; \
-	aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR"; \
+	aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \
 	case "$dpkgArch" in \
 		amd64 | arm64 | ppc64el) \
 # arches officialy built by upstream
diff --git a/15/bullseye/docker-ensure-initdb.sh b/15/trixie/docker-ensure-initdb.sh
similarity index 100%
rename from 15/bullseye/docker-ensure-initdb.sh
rename to 15/trixie/docker-ensure-initdb.sh
diff --git a/15/bullseye/docker-entrypoint.sh b/15/trixie/docker-entrypoint.sh
similarity index 100%
rename from 15/bullseye/docker-entrypoint.sh
rename to 15/trixie/docker-entrypoint.sh
diff --git a/16/bullseye/Dockerfile b/16/trixie/Dockerfile
similarity index 98%
rename from 16/bullseye/Dockerfile
rename to 16/trixie/Dockerfile
index a3ac0c55ab..495542ed54 100644
--- a/16/bullseye/Dockerfile
+++ b/16/trixie/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 # explicitly set user/group IDs
 RUN set -eux; \
@@ -89,7 +89,7 @@ RUN set -ex; \
 ENV PG_MAJOR 16
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 16.9-1.pgdg110+1
+ENV PG_VERSION 16.9-1.pgdg130+1
 
 RUN set -ex; \
 	\
@@ -97,7 +97,7 @@ RUN set -ex; \
 	export PYTHONDONTWRITEBYTECODE=1; \
 	\
 	dpkgArch="$(dpkg --print-architecture)"; \
-	aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR"; \
+	aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \
 	case "$dpkgArch" in \
 		amd64 | arm64 | ppc64el) \
 # arches officialy built by upstream
diff --git a/16/bullseye/docker-ensure-initdb.sh b/16/trixie/docker-ensure-initdb.sh
similarity index 100%
rename from 16/bullseye/docker-ensure-initdb.sh
rename to 16/trixie/docker-ensure-initdb.sh
diff --git a/16/bullseye/docker-entrypoint.sh b/16/trixie/docker-entrypoint.sh
similarity index 100%
rename from 16/bullseye/docker-entrypoint.sh
rename to 16/trixie/docker-entrypoint.sh
diff --git a/17/bullseye/Dockerfile b/17/trixie/Dockerfile
similarity index 98%
rename from 17/bullseye/Dockerfile
rename to 17/trixie/Dockerfile
index fc554d1fae..c8bbab14db 100644
--- a/17/bullseye/Dockerfile
+++ b/17/trixie/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 # explicitly set user/group IDs
 RUN set -eux; \
@@ -89,7 +89,7 @@ RUN set -ex; \
 ENV PG_MAJOR 17
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 17.5-1.pgdg110+1
+ENV PG_VERSION 17.5-1.pgdg130+1
 
 RUN set -ex; \
 	\
@@ -97,7 +97,7 @@ RUN set -ex; \
 	export PYTHONDONTWRITEBYTECODE=1; \
 	\
 	dpkgArch="$(dpkg --print-architecture)"; \
-	aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR"; \
+	aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \
 	case "$dpkgArch" in \
 		amd64 | arm64 | ppc64el) \
 # arches officialy built by upstream
diff --git a/17/bullseye/docker-ensure-initdb.sh b/17/trixie/docker-ensure-initdb.sh
similarity index 100%
rename from 17/bullseye/docker-ensure-initdb.sh
rename to 17/trixie/docker-ensure-initdb.sh
diff --git a/17/bullseye/docker-entrypoint.sh b/17/trixie/docker-entrypoint.sh
similarity index 100%
rename from 17/bullseye/docker-entrypoint.sh
rename to 17/trixie/docker-entrypoint.sh
diff --git a/18/bullseye/Dockerfile b/18/trixie/Dockerfile
similarity index 98%
rename from 18/bullseye/Dockerfile
rename to 18/trixie/Dockerfile
index 896dd4475f..ad494143a0 100644
--- a/18/bullseye/Dockerfile
+++ b/18/trixie/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 # explicitly set user/group IDs
 RUN set -eux; \
@@ -89,7 +89,7 @@ RUN set -ex; \
 ENV PG_MAJOR 18
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 18~beta2-1.pgdg110+1
+ENV PG_VERSION 18~beta2-1.pgdg130+1
 
 RUN set -ex; \
 	\
@@ -97,7 +97,7 @@ RUN set -ex; \
 	export PYTHONDONTWRITEBYTECODE=1; \
 	\
 	dpkgArch="$(dpkg --print-architecture)"; \
-	aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR"; \
+	aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \
 	case "$dpkgArch" in \
 		amd64 | arm64 | ppc64el) \
 # arches officialy built by upstream
diff --git a/18/bullseye/docker-ensure-initdb.sh b/18/trixie/docker-ensure-initdb.sh
similarity index 100%
rename from 18/bullseye/docker-ensure-initdb.sh
rename to 18/trixie/docker-ensure-initdb.sh
diff --git a/18/bullseye/docker-entrypoint.sh b/18/trixie/docker-entrypoint.sh
similarity index 100%
rename from 18/bullseye/docker-entrypoint.sh
rename to 18/trixie/docker-entrypoint.sh
diff --git a/versions.json b/versions.json
index dc49222596..9d31c55cb8 100644
--- a/versions.json
+++ b/versions.json
@@ -1,176 +1,176 @@
 {
-  "13": {
+  "18": {
     "alpine": "3.22",
-    "bookworm": {
+    "debian": "trixie",
+    "trixie": {
+      "version": "18~beta2-1.pgdg130+1",
       "arches": [
         "amd64",
         "arm64",
         "ppc64el"
-      ],
-      "version": "13.21-1.pgdg120+1"
+      ]
     },
-    "bullseye": {
-      "arches": [
-        "amd64",
-        "arm64",
-        "ppc64el"
-      ],
-      "version": "13.21-1.pgdg110+1"
-    },
-    "debian": "bookworm",
-    "major": 13,
-    "sha256": "dcda1294df45f033b0656cf7a8e4afbbc624c25e1b144aec79530f74d7ef4ab4",
     "variants": [
+      "trixie",
       "bookworm",
-      "bullseye",
       "alpine3.22",
       "alpine3.21"
     ],
-    "version": "13.21"
-  },
-  "14": {
-    "alpine": "3.22",
     "bookworm": {
+      "version": "18~beta2-1.pgdg120+1",
       "arches": [
         "amd64",
         "arm64",
         "ppc64el"
-      ],
-      "version": "14.18-1.pgdg120+1"
+      ]
     },
-    "bullseye": {
-      "arches": [
-        "amd64",
-        "arm64",
-        "ppc64el"
-      ],
-      "version": "14.18-1.pgdg110+1"
-    },
-    "debian": "bookworm",
-    "major": 14,
-    "sha256": "83ab29d6bfc3dc58b2ed3c664114fdfbeb6a0450c4b8d7fa69aee91e3ca14f8e",
-    "variants": [
-      "bookworm",
-      "bullseye",
-      "alpine3.22",
-      "alpine3.21"
-    ],
-    "version": "14.18"
-  },
-  "15": {
-    "alpine": "3.22",
-    "bookworm": {
-      "arches": [
-        "amd64",
-        "arm64",
-        "ppc64el"
-      ],
-      "version": "15.13-1.pgdg120+1"
-    },
-    "bullseye": {
-      "arches": [
-        "amd64",
-        "arm64",
-        "ppc64el"
-      ],
-      "version": "15.13-1.pgdg110+1"
-    },
-    "debian": "bookworm",
-    "major": 15,
-    "sha256": "4f62e133d22ea08a0401b0840920e26698644d01a80c34341fb732dd0a90ca5d",
-    "variants": [
-      "bookworm",
-      "bullseye",
-      "alpine3.22",
-      "alpine3.21"
-    ],
-    "version": "15.13"
-  },
-  "16": {
-    "alpine": "3.22",
-    "bookworm": {
-      "arches": [
-        "amd64",
-        "arm64",
-        "ppc64el"
-      ],
-      "version": "16.9-1.pgdg120+1"
-    },
-    "bullseye": {
-      "arches": [
-        "amd64",
-        "arm64",
-        "ppc64el"
-      ],
-      "version": "16.9-1.pgdg110+1"
-    },
-    "debian": "bookworm",
-    "major": 16,
-    "sha256": "07c00fb824df0a0c295f249f44691b86e3266753b380c96f633c3311e10bd005",
-    "variants": [
-      "bookworm",
-      "bullseye",
-      "alpine3.22",
-      "alpine3.21"
-    ],
-    "version": "16.9"
+    "version": "18beta2",
+    "sha256": "1d16b58244b630194432b88d9ff25f5fea85a001ff2c715a157d4be6787f3075",
+    "major": 18
   },
   "17": {
     "alpine": "3.22",
+    "debian": "trixie",
+    "trixie": {
+      "version": "17.5-1.pgdg130+1",
+      "arches": [
+        "amd64",
+        "arm64",
+        "ppc64el"
+      ]
+    },
+    "variants": [
+      "trixie",
+      "bookworm",
+      "alpine3.22",
+      "alpine3.21"
+    ],
     "bookworm": {
+      "version": "17.5-1.pgdg120+1",
       "arches": [
         "amd64",
         "arm64",
         "ppc64el"
-      ],
-      "version": "17.5-1.pgdg120+1"
+      ]
     },
-    "bullseye": {
-      "arches": [
-        "amd64",
-        "arm64",
-        "ppc64el"
-      ],
-      "version": "17.5-1.pgdg110+1"
-    },
-    "debian": "bookworm",
-    "major": 17,
+    "version": "17.5",
     "sha256": "fcb7ab38e23b264d1902cb25e6adafb4525a6ebcbd015434aeef9eda80f528d8",
-    "variants": [
-      "bookworm",
-      "bullseye",
-      "alpine3.22",
-      "alpine3.21"
-    ],
-    "version": "17.5"
+    "major": 17
   },
-  "18": {
+  "16": {
     "alpine": "3.22",
-    "bookworm": {
+    "debian": "trixie",
+    "trixie": {
+      "version": "16.9-1.pgdg130+1",
       "arches": [
         "amd64",
         "arm64",
         "ppc64el"
-      ],
-      "version": "18~beta2-1.pgdg120+1"
+      ]
     },
-    "bullseye": {
-      "arches": [
-        "amd64",
-        "arm64",
-        "ppc64el"
-      ],
-      "version": "18~beta2-1.pgdg110+1"
-    },
-    "debian": "bookworm",
-    "major": 18,
-    "sha256": "1d16b58244b630194432b88d9ff25f5fea85a001ff2c715a157d4be6787f3075",
     "variants": [
+      "trixie",
       "bookworm",
-      "bullseye",
       "alpine3.22",
       "alpine3.21"
     ],
-    "version": "18beta2"
+    "bookworm": {
+      "version": "16.9-1.pgdg120+1",
+      "arches": [
+        "amd64",
+        "arm64",
+        "ppc64el"
+      ]
+    },
+    "version": "16.9",
+    "sha256": "07c00fb824df0a0c295f249f44691b86e3266753b380c96f633c3311e10bd005",
+    "major": 16
+  },
+  "15": {
+    "alpine": "3.22",
+    "debian": "trixie",
+    "trixie": {
+      "version": "15.13-1.pgdg130+1",
+      "arches": [
+        "amd64",
+        "arm64",
+        "ppc64el"
+      ]
+    },
+    "variants": [
+      "trixie",
+      "bookworm",
+      "alpine3.22",
+      "alpine3.21"
+    ],
+    "bookworm": {
+      "version": "15.13-1.pgdg120+1",
+      "arches": [
+        "amd64",
+        "arm64",
+        "ppc64el"
+      ]
+    },
+    "version": "15.13",
+    "sha256": "4f62e133d22ea08a0401b0840920e26698644d01a80c34341fb732dd0a90ca5d",
+    "major": 15
+  },
+  "14": {
+    "alpine": "3.22",
+    "debian": "trixie",
+    "trixie": {
+      "version": "14.18-1.pgdg130+1",
+      "arches": [
+        "amd64",
+        "arm64",
+        "ppc64el"
+      ]
+    },
+    "variants": [
+      "trixie",
+      "bookworm",
+      "alpine3.22",
+      "alpine3.21"
+    ],
+    "bookworm": {
+      "version": "14.18-1.pgdg120+1",
+      "arches": [
+        "amd64",
+        "arm64",
+        "ppc64el"
+      ]
+    },
+    "version": "14.18",
+    "sha256": "83ab29d6bfc3dc58b2ed3c664114fdfbeb6a0450c4b8d7fa69aee91e3ca14f8e",
+    "major": 14
+  },
+  "13": {
+    "alpine": "3.22",
+    "debian": "trixie",
+    "trixie": {
+      "version": "13.21-1.pgdg130+1",
+      "arches": [
+        "amd64",
+        "arm64",
+        "ppc64el"
+      ]
+    },
+    "variants": [
+      "trixie",
+      "bookworm",
+      "alpine3.22",
+      "alpine3.21"
+    ],
+    "bookworm": {
+      "version": "13.21-1.pgdg120+1",
+      "arches": [
+        "amd64",
+        "arm64",
+        "ppc64el"
+      ]
+    },
+    "version": "13.21",
+    "sha256": "dcda1294df45f033b0656cf7a8e4afbbc624c25e1b144aec79530f74d7ef4ab4",
+    "major": 13
   }
 }
diff --git a/versions.sh b/versions.sh
index f466ac57a9..0933e1813f 100755
--- a/versions.sh
+++ b/versions.sh
@@ -3,8 +3,8 @@ set -Eeuo pipefail
 
 # we will support at most two entries in each of these lists, and both should be in descending order
 supportedDebianSuites=(
+	trixie
 	bookworm
-	bullseye
 )
 supportedAlpineVersions=(
 	3.22
@@ -151,4 +151,4 @@ for version in "${versions[@]}"; do
 	')"
 done
 
-jq <<<"$json" -S . > versions.json
+jq <<<"$json" 'to_entries | sort_by(.key | split(".") | map(tonumber? // .)) | reverse | from_entries' > versions.json