diff --git a/13/alpine3.21/Dockerfile b/13/alpine3.21/Dockerfile
index c79dfd0bb7..14ee62d763 100644
--- a/13/alpine3.21/Dockerfile
+++ b/13/alpine3.21/Dockerfile
@@ -53,8 +53,8 @@ ENV LANG en_US.utf8
 RUN mkdir /docker-entrypoint-initdb.d
 
 ENV PG_MAJOR 13
-ENV PG_VERSION 13.21
-ENV PG_SHA256 dcda1294df45f033b0656cf7a8e4afbbc624c25e1b144aec79530f74d7ef4ab4
+ENV PG_VERSION 13.22
+ENV PG_SHA256 d36d83dc89e625502cf6fb1d0529642ba1266bd614b4e4a41cefd1dddcf09080
 
 ENV DOCKER_PG_LLVM_DEPS \
 		llvm19-dev \
diff --git a/13/alpine3.22/Dockerfile b/13/alpine3.22/Dockerfile
index ece37e9796..8e250b688a 100644
--- a/13/alpine3.22/Dockerfile
+++ b/13/alpine3.22/Dockerfile
@@ -53,8 +53,8 @@ ENV LANG en_US.utf8
 RUN mkdir /docker-entrypoint-initdb.d
 
 ENV PG_MAJOR 13
-ENV PG_VERSION 13.21
-ENV PG_SHA256 dcda1294df45f033b0656cf7a8e4afbbc624c25e1b144aec79530f74d7ef4ab4
+ENV PG_VERSION 13.22
+ENV PG_SHA256 d36d83dc89e625502cf6fb1d0529642ba1266bd614b4e4a41cefd1dddcf09080
 
 ENV DOCKER_PG_LLVM_DEPS \
 		llvm19-dev \
diff --git a/13/bookworm/Dockerfile b/13/bookworm/Dockerfile
index 721ad94d09..6d4f27fbb5 100644
--- a/13/bookworm/Dockerfile
+++ b/13/bookworm/Dockerfile
@@ -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.pgdg120+1
+ENV PG_VERSION 13.22-1.pgdg12+1
 
 RUN set -ex; \
 	\
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..dff96a88af 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.22-1.pgdg13+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/alpine3.21/Dockerfile b/14/alpine3.21/Dockerfile
index 49eb44c2c7..03629baee8 100644
--- a/14/alpine3.21/Dockerfile
+++ b/14/alpine3.21/Dockerfile
@@ -53,8 +53,8 @@ ENV LANG en_US.utf8
 RUN mkdir /docker-entrypoint-initdb.d
 
 ENV PG_MAJOR 14
-ENV PG_VERSION 14.18
-ENV PG_SHA256 83ab29d6bfc3dc58b2ed3c664114fdfbeb6a0450c4b8d7fa69aee91e3ca14f8e
+ENV PG_VERSION 14.19
+ENV PG_SHA256 727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80
 
 ENV DOCKER_PG_LLVM_DEPS \
 		llvm19-dev \
diff --git a/14/alpine3.22/Dockerfile b/14/alpine3.22/Dockerfile
index 238930ef21..8d1a3f487b 100644
--- a/14/alpine3.22/Dockerfile
+++ b/14/alpine3.22/Dockerfile
@@ -53,8 +53,8 @@ ENV LANG en_US.utf8
 RUN mkdir /docker-entrypoint-initdb.d
 
 ENV PG_MAJOR 14
-ENV PG_VERSION 14.18
-ENV PG_SHA256 83ab29d6bfc3dc58b2ed3c664114fdfbeb6a0450c4b8d7fa69aee91e3ca14f8e
+ENV PG_VERSION 14.19
+ENV PG_SHA256 727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80
 
 ENV DOCKER_PG_LLVM_DEPS \
 		llvm19-dev \
diff --git a/14/bookworm/Dockerfile b/14/bookworm/Dockerfile
index e9a0e21b1c..229905fecc 100644
--- a/14/bookworm/Dockerfile
+++ b/14/bookworm/Dockerfile
@@ -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.pgdg120+1
+ENV PG_VERSION 14.19-1.pgdg12+1
 
 RUN set -ex; \
 	\
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..3708b63e2a 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.19-1.pgdg13+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/alpine3.21/Dockerfile b/15/alpine3.21/Dockerfile
index 91ab89c023..6901a43de4 100644
--- a/15/alpine3.21/Dockerfile
+++ b/15/alpine3.21/Dockerfile
@@ -53,8 +53,8 @@ ENV LANG en_US.utf8
 RUN mkdir /docker-entrypoint-initdb.d
 
 ENV PG_MAJOR 15
-ENV PG_VERSION 15.13
-ENV PG_SHA256 4f62e133d22ea08a0401b0840920e26698644d01a80c34341fb732dd0a90ca5d
+ENV PG_VERSION 15.14
+ENV PG_SHA256 06dd75d305cd3870ee62b3932e661c624543eaf9ae2ba37cdec0a4f8edd051d2
 
 ENV DOCKER_PG_LLVM_DEPS \
 		llvm19-dev \
diff --git a/15/alpine3.22/Dockerfile b/15/alpine3.22/Dockerfile
index 201065d8a3..15858f83ab 100644
--- a/15/alpine3.22/Dockerfile
+++ b/15/alpine3.22/Dockerfile
@@ -53,8 +53,8 @@ ENV LANG en_US.utf8
 RUN mkdir /docker-entrypoint-initdb.d
 
 ENV PG_MAJOR 15
-ENV PG_VERSION 15.13
-ENV PG_SHA256 4f62e133d22ea08a0401b0840920e26698644d01a80c34341fb732dd0a90ca5d
+ENV PG_VERSION 15.14
+ENV PG_SHA256 06dd75d305cd3870ee62b3932e661c624543eaf9ae2ba37cdec0a4f8edd051d2
 
 ENV DOCKER_PG_LLVM_DEPS \
 		llvm19-dev \
diff --git a/15/bookworm/Dockerfile b/15/bookworm/Dockerfile
index d58f9ab6a4..34004b4332 100644
--- a/15/bookworm/Dockerfile
+++ b/15/bookworm/Dockerfile
@@ -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.pgdg120+1
+ENV PG_VERSION 15.14-1.pgdg12+1
 
 RUN set -ex; \
 	\
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..bb1263f8cb 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.14-1.pgdg13+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/alpine3.21/Dockerfile b/16/alpine3.21/Dockerfile
index 1bf2cab5a5..103570a9d1 100644
--- a/16/alpine3.21/Dockerfile
+++ b/16/alpine3.21/Dockerfile
@@ -53,8 +53,8 @@ ENV LANG en_US.utf8
 RUN mkdir /docker-entrypoint-initdb.d
 
 ENV PG_MAJOR 16
-ENV PG_VERSION 16.9
-ENV PG_SHA256 07c00fb824df0a0c295f249f44691b86e3266753b380c96f633c3311e10bd005
+ENV PG_VERSION 16.10
+ENV PG_SHA256 de8485f4ce9c32e3ddfeef0b7c261eed1cecb54c9bcd170e437ff454cb292b42
 
 ENV DOCKER_PG_LLVM_DEPS \
 		llvm19-dev \
diff --git a/16/alpine3.22/Dockerfile b/16/alpine3.22/Dockerfile
index 902de7538f..f461d9e426 100644
--- a/16/alpine3.22/Dockerfile
+++ b/16/alpine3.22/Dockerfile
@@ -53,8 +53,8 @@ ENV LANG en_US.utf8
 RUN mkdir /docker-entrypoint-initdb.d
 
 ENV PG_MAJOR 16
-ENV PG_VERSION 16.9
-ENV PG_SHA256 07c00fb824df0a0c295f249f44691b86e3266753b380c96f633c3311e10bd005
+ENV PG_VERSION 16.10
+ENV PG_SHA256 de8485f4ce9c32e3ddfeef0b7c261eed1cecb54c9bcd170e437ff454cb292b42
 
 ENV DOCKER_PG_LLVM_DEPS \
 		llvm19-dev \
diff --git a/16/bookworm/Dockerfile b/16/bookworm/Dockerfile
index 7421ccaf0a..49f704308b 100644
--- a/16/bookworm/Dockerfile
+++ b/16/bookworm/Dockerfile
@@ -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.pgdg120+1
+ENV PG_VERSION 16.10-1.pgdg12+1
 
 RUN set -ex; \
 	\
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..db0988a3cb 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.10-1.pgdg13+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/alpine3.21/Dockerfile b/17/alpine3.21/Dockerfile
index c3c81bd437..c4afe749b8 100644
--- a/17/alpine3.21/Dockerfile
+++ b/17/alpine3.21/Dockerfile
@@ -52,8 +52,8 @@ ENV LANG en_US.utf8
 RUN mkdir /docker-entrypoint-initdb.d
 
 ENV PG_MAJOR 17
-ENV PG_VERSION 17.5
-ENV PG_SHA256 fcb7ab38e23b264d1902cb25e6adafb4525a6ebcbd015434aeef9eda80f528d8
+ENV PG_VERSION 17.6
+ENV PG_SHA256 e0630a3600aea27511715563259ec2111cd5f4353a4b040e0be827f94cd7a8b0
 
 ENV DOCKER_PG_LLVM_DEPS \
 		llvm19-dev \
diff --git a/17/alpine3.22/Dockerfile b/17/alpine3.22/Dockerfile
index 5c303bd7d0..3fab5a6194 100644
--- a/17/alpine3.22/Dockerfile
+++ b/17/alpine3.22/Dockerfile
@@ -52,8 +52,8 @@ ENV LANG en_US.utf8
 RUN mkdir /docker-entrypoint-initdb.d
 
 ENV PG_MAJOR 17
-ENV PG_VERSION 17.5
-ENV PG_SHA256 fcb7ab38e23b264d1902cb25e6adafb4525a6ebcbd015434aeef9eda80f528d8
+ENV PG_VERSION 17.6
+ENV PG_SHA256 e0630a3600aea27511715563259ec2111cd5f4353a4b040e0be827f94cd7a8b0
 
 ENV DOCKER_PG_LLVM_DEPS \
 		llvm19-dev \
diff --git a/17/bookworm/Dockerfile b/17/bookworm/Dockerfile
index 25c2142f1f..aec2a51f6c 100644
--- a/17/bookworm/Dockerfile
+++ b/17/bookworm/Dockerfile
@@ -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.pgdg120+1
+ENV PG_VERSION 17.6-1.pgdg12+1
 
 RUN set -ex; \
 	\
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..5df4f8c718 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.6-1.pgdg13+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/alpine3.21/Dockerfile b/18/alpine3.21/Dockerfile
index e9eff8d01f..aa00a7d514 100644
--- a/18/alpine3.21/Dockerfile
+++ b/18/alpine3.21/Dockerfile
@@ -52,8 +52,8 @@ ENV LANG en_US.utf8
 RUN mkdir /docker-entrypoint-initdb.d
 
 ENV PG_MAJOR 18
-ENV PG_VERSION 18beta1
-ENV PG_SHA256 0b7c83df6195398aa67dbf5c002e7fa4082be393aae99aa69926d483f98eb885
+ENV PG_VERSION 18beta3
+ENV PG_SHA256 21d86e55eea11300c3a2212647dc3d48bd844b83017cf6ce5684639ad8f95278
 
 ENV DOCKER_PG_LLVM_DEPS \
 		llvm19-dev \
diff --git a/18/alpine3.22/Dockerfile b/18/alpine3.22/Dockerfile
index 248d5cb987..0a8c65082e 100644
--- a/18/alpine3.22/Dockerfile
+++ b/18/alpine3.22/Dockerfile
@@ -52,8 +52,8 @@ ENV LANG en_US.utf8
 RUN mkdir /docker-entrypoint-initdb.d
 
 ENV PG_MAJOR 18
-ENV PG_VERSION 18beta1
-ENV PG_SHA256 0b7c83df6195398aa67dbf5c002e7fa4082be393aae99aa69926d483f98eb885
+ENV PG_VERSION 18beta3
+ENV PG_SHA256 21d86e55eea11300c3a2212647dc3d48bd844b83017cf6ce5684639ad8f95278
 
 ENV DOCKER_PG_LLVM_DEPS \
 		llvm19-dev \
diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile
index 0cf4c0fb08..56332c51ec 100644
--- a/18/bookworm/Dockerfile
+++ b/18/bookworm/Dockerfile
@@ -89,7 +89,7 @@ RUN set -ex; \
 ENV PG_MAJOR 18
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 18~beta1-1.pgdg120+1
+ENV PG_VERSION 18~beta3-1.pgdg120+1
 
 RUN set -ex; \
 	\
diff --git a/18/bullseye/Dockerfile b/18/trixie/Dockerfile
similarity index 98%
rename from 18/bullseye/Dockerfile
rename to 18/trixie/Dockerfile
index 2a4b74b9ff..76307015d7 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~beta1-1.pgdg110+1
+ENV PG_VERSION 18~beta3-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 96e2558966..04ec5498ba 100644
--- a/versions.json
+++ b/versions.json
@@ -1,176 +1,176 @@
 {
-  "13": {
+  "18": {
     "alpine": "3.22",
-    "bookworm": {
+    "debian": "trixie",
+    "trixie": {
+      "version": "18~beta3-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~beta3-1.pgdg120+1",
       "arches": [
         "amd64",
         "arm64",
         "ppc64el"
-      ],
-      "version": "14.18-1.pgdg120+1"
+      ]
     },
-    "bullseye": {
+    "version": "18beta3",
+    "sha256": "21d86e55eea11300c3a2212647dc3d48bd844b83017cf6ce5684639ad8f95278",
+    "major": 18
+  },
+  "17": {
+    "alpine": "3.22",
+    "debian": "trixie",
+    "trixie": {
+      "version": "17.6-1.pgdg13+1",
       "arches": [
         "amd64",
         "arm64",
         "ppc64el"
-      ],
-      "version": "14.18-1.pgdg110+1"
+      ]
     },
-    "debian": "bookworm",
-    "major": 14,
-    "sha256": "83ab29d6bfc3dc58b2ed3c664114fdfbeb6a0450c4b8d7fa69aee91e3ca14f8e",
     "variants": [
+      "trixie",
       "bookworm",
-      "bullseye",
       "alpine3.22",
       "alpine3.21"
     ],
-    "version": "14.18"
-  },
-  "15": {
-    "alpine": "3.22",
     "bookworm": {
+      "version": "17.6-1.pgdg12+1",
       "arches": [
         "amd64",
         "arm64",
         "ppc64el"
-      ],
-      "version": "15.13-1.pgdg120+1"
+      ]
     },
-    "bullseye": {
+    "version": "17.6",
+    "sha256": "e0630a3600aea27511715563259ec2111cd5f4353a4b040e0be827f94cd7a8b0",
+    "major": 17
+  },
+  "16": {
+    "alpine": "3.22",
+    "debian": "trixie",
+    "trixie": {
+      "version": "16.10-1.pgdg13+1",
       "arches": [
         "amd64",
         "arm64",
         "ppc64el"
-      ],
-      "version": "15.13-1.pgdg110+1"
+      ]
     },
-    "debian": "bookworm",
-    "major": 15,
-    "sha256": "4f62e133d22ea08a0401b0840920e26698644d01a80c34341fb732dd0a90ca5d",
     "variants": [
+      "trixie",
       "bookworm",
-      "bullseye",
       "alpine3.22",
       "alpine3.21"
     ],
-    "version": "15.13"
-  },
-  "16": {
-    "alpine": "3.22",
     "bookworm": {
+      "version": "16.10-1.pgdg12+1",
       "arches": [
         "amd64",
         "arm64",
         "ppc64el"
-      ],
-      "version": "16.9-1.pgdg120+1"
+      ]
     },
-    "bullseye": {
+    "version": "16.10",
+    "sha256": "de8485f4ce9c32e3ddfeef0b7c261eed1cecb54c9bcd170e437ff454cb292b42",
+    "major": 16
+  },
+  "15": {
+    "alpine": "3.22",
+    "debian": "trixie",
+    "trixie": {
+      "version": "15.14-1.pgdg13+1",
       "arches": [
         "amd64",
         "arm64",
         "ppc64el"
-      ],
-      "version": "16.9-1.pgdg110+1"
+      ]
     },
-    "debian": "bookworm",
-    "major": 16,
-    "sha256": "07c00fb824df0a0c295f249f44691b86e3266753b380c96f633c3311e10bd005",
     "variants": [
+      "trixie",
       "bookworm",
-      "bullseye",
       "alpine3.22",
       "alpine3.21"
     ],
-    "version": "16.9"
-  },
-  "17": {
-    "alpine": "3.22",
     "bookworm": {
+      "version": "15.14-1.pgdg12+1",
       "arches": [
         "amd64",
         "arm64",
         "ppc64el"
-      ],
-      "version": "17.5-1.pgdg120+1"
+      ]
     },
-    "bullseye": {
+    "version": "15.14",
+    "sha256": "06dd75d305cd3870ee62b3932e661c624543eaf9ae2ba37cdec0a4f8edd051d2",
+    "major": 15
+  },
+  "14": {
+    "alpine": "3.22",
+    "debian": "trixie",
+    "trixie": {
+      "version": "14.19-1.pgdg13+1",
       "arches": [
         "amd64",
         "arm64",
         "ppc64el"
-      ],
-      "version": "17.5-1.pgdg110+1"
+      ]
     },
-    "debian": "bookworm",
-    "major": 17,
-    "sha256": "fcb7ab38e23b264d1902cb25e6adafb4525a6ebcbd015434aeef9eda80f528d8",
     "variants": [
+      "trixie",
       "bookworm",
-      "bullseye",
       "alpine3.22",
       "alpine3.21"
     ],
-    "version": "17.5"
-  },
-  "18": {
-    "alpine": "3.22",
     "bookworm": {
+      "version": "14.19-1.pgdg12+1",
       "arches": [
         "amd64",
         "arm64",
         "ppc64el"
-      ],
-      "version": "18~beta1-1.pgdg120+1"
+      ]
     },
-    "bullseye": {
+    "version": "14.19",
+    "sha256": "727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80",
+    "major": 14
+  },
+  "13": {
+    "alpine": "3.22",
+    "debian": "trixie",
+    "trixie": {
+      "version": "13.22-1.pgdg13+1",
       "arches": [
         "amd64",
         "arm64",
         "ppc64el"
-      ],
-      "version": "18~beta1-1.pgdg110+1"
+      ]
     },
-    "debian": "bookworm",
-    "major": 18,
-    "sha256": "0b7c83df6195398aa67dbf5c002e7fa4082be393aae99aa69926d483f98eb885",
     "variants": [
+      "trixie",
       "bookworm",
-      "bullseye",
       "alpine3.22",
       "alpine3.21"
     ],
-    "version": "18beta1"
+    "bookworm": {
+      "version": "13.22-1.pgdg12+1",
+      "arches": [
+        "amd64",
+        "arm64",
+        "ppc64el"
+      ]
+    },
+    "version": "13.22",
+    "sha256": "d36d83dc89e625502cf6fb1d0529642ba1266bd614b4e4a41cefd1dddcf09080",
+    "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
