diff --git a/UBI/12/Dockerfile.postgis-multiarch.ubi8 b/UBI/12/Dockerfile.postgis-multiarch.ubi8
index 0f8ea260..91d26de5 100644
--- a/UBI/12/Dockerfile.postgis-multiarch.ubi8
+++ b/UBI/12/Dockerfile.postgis-multiarch.ubi8
@@ -127,7 +127,7 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 					exit 1 ;; \
 	esac ; \
 	yum -y install --setopt=install_weak_deps=0 \
-		--enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_12-3.4.3 \
 		"$pgrouting_pkg" \
 	; \
diff --git a/UBI/12/Dockerfile.postgis-multiarch.ubi9 b/UBI/12/Dockerfile.postgis-multiarch.ubi9
index cba71ba5..26829746 100644
--- a/UBI/12/Dockerfile.postgis-multiarch.ubi9
+++ b/UBI/12/Dockerfile.postgis-multiarch.ubi9
@@ -127,7 +127,7 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 					exit 1 ;; \
 	esac ; \
 	yum -y install --setopt=install_weak_deps=0 \
-		--enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis34_12-3.4.3 \
 		"$pgrouting_pkg" \
 	; \
diff --git a/UBI/12/Dockerfile.postgis-multilang.ubi8 b/UBI/12/Dockerfile.postgis-multilang.ubi8
index cb4efdc9..2205aaf4 100644
--- a/UBI/12/Dockerfile.postgis-multilang.ubi8
+++ b/UBI/12/Dockerfile.postgis-multilang.ubi8
@@ -93,7 +93,7 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 					exit 1 ;; \
 	esac ; \
 	yum -y install --setopt=install_weak_deps=0 \
-		--enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_12-3.4.3 \
 		pgrouting_12 \
 	; \
diff --git a/UBI/12/Dockerfile.postgis-multilang.ubi9 b/UBI/12/Dockerfile.postgis-multilang.ubi9
index e53c0cad..bcee23b8 100644
--- a/UBI/12/Dockerfile.postgis-multilang.ubi9
+++ b/UBI/12/Dockerfile.postgis-multilang.ubi9
@@ -93,7 +93,7 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 					exit 1 ;; \
 	esac ; \
 	yum -y install --setopt=install_weak_deps=0 \
-		--enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis34_12-3.4.3 \
 		pgrouting_12 \
 	; \
diff --git a/UBI/12/Dockerfile.postgis.ubi8 b/UBI/12/Dockerfile.postgis.ubi8
index 036e4d8d..a40e226b 100644
--- a/UBI/12/Dockerfile.postgis.ubi8
+++ b/UBI/12/Dockerfile.postgis.ubi8
@@ -92,7 +92,7 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 					exit 1 ;; \
 	esac ; \
 	yum -y install --setopt=install_weak_deps=0 \
-		--enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_12-3.4.3 \
 		pgrouting_12 \
 	; \
diff --git a/UBI/12/Dockerfile.postgis.ubi9 b/UBI/12/Dockerfile.postgis.ubi9
index 05dc498e..0e5402ce 100644
--- a/UBI/12/Dockerfile.postgis.ubi9
+++ b/UBI/12/Dockerfile.postgis.ubi9
@@ -92,7 +92,7 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 					exit 1 ;; \
 	esac ; \
 	yum -y install --setopt=install_weak_deps=0 \
-		--enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis34_12-3.4.3 \
 		pgrouting_12 \
 	; \
diff --git a/UBI/13/.versions-postgis-ubi8.json b/UBI/13/.versions-postgis-ubi8.json
index 7fb2de67..56415c93 100644
--- a/UBI/13/.versions-postgis-ubi8.json
+++ b/UBI/13/.versions-postgis-ubi8.json
@@ -1,7 +1,7 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "20",
+  "IMAGE_RELEASE_VERSION": "1",
   "POSTGIS_VERSION": "3.4.2",
-  "POSTGRES_VERSION": "13.16",
-  "UBI_VERSION": "8.10-1054"
+  "POSTGRES_VERSION": "13.18",
+  "UBI_VERSION": "8.10-1132.1731461736"
 }
diff --git a/UBI/13/.versions-postgis-ubi9.json b/UBI/13/.versions-postgis-ubi9.json
index 8e6f811b..704b47a3 100644
--- a/UBI/13/.versions-postgis-ubi9.json
+++ b/UBI/13/.versions-postgis-ubi9.json
@@ -1,7 +1,7 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "21",
+  "IMAGE_RELEASE_VERSION": "1",
   "POSTGIS_VERSION": "3.4.2",
-  "POSTGRES_VERSION": "13.16",
-  "UBI_VERSION": "9.4-1214"
+  "POSTGRES_VERSION": "13.18",
+  "UBI_VERSION": "9.5-1731517889"
 }
diff --git a/UBI/13/Dockerfile.postgis-multiarch.ubi8 b/UBI/13/Dockerfile.postgis-multiarch.ubi8
index 4ca6f7be..711c7b87 100644
--- a/UBI/13/Dockerfile.postgis-multiarch.ubi8
+++ b/UBI/13/Dockerfile.postgis-multiarch.ubi8
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1054
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="13.16" \
-      release="20" \
+      version="13.18" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
@@ -22,6 +22,7 @@ RUN --mount=type=secret,id=cs_token \
 	pg_squeeze_pkg="pg_squeeze_13" ; \
 	pgvector="pgvector_13" ; \
 	pg_audit_pkg="pgaudit15_13" ; \
+	wal2json_pkg="wal2json_13" ; \
 	case $ARCH in \
 			amd64) \
 					yum -y install "${base_url}/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \
@@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg13-pg-squeeze1" ; \
 					pgvector="edb-pg13-pgvector0" ; \
 					pg_audit_pkg="edb-pg13-pgaudit1" ; \
+					wal2json_pkg="edb-pg13-wal2json2" ; \
 					if [ "13" -gt "15" ]; then pg_audit_pkg="edb-pg13-pgaudit13"; fi ;; \
 			s390x) \
 					curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \
@@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg13-pg-squeeze1" ; \
 					pgvector="edb-pg13-pgvector0" ; \
 					pg_audit_pkg="edb-pg13-pgaudit1" ; \
+					wal2json_pkg="edb-pg13-wal2json2" ; \
 					if [ "13" -gt "15" ]; then pg_audit_pkg="edb-pg13-pgaudit13"; fi ;; \
 			*) \
 					exit 1 ;; \
@@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-			postgresql13-13.16 \
-			postgresql13-contrib-13.16 \
-			postgresql13-server-13.16 \
-			postgresql13-libs-13.16 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+			postgresql13-13.18 \
+			postgresql13-contrib-13.18 \
+			postgresql13-server-13.18 \
+			postgresql13-libs-13.18 \
 			"$pg_audit_pkg" \
 			"$pg_squeeze_pkg" \
 			"$pg_failover_slots_pkg" \
 			"$pgvector" \
+			"$wal2json_pkg" \
 	; \
 	rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \
 	rm -fr /tmp/* ; \
@@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -122,7 +126,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_13-3.4.2 \
 		"$pgrouting_pkg" \
 	; \
diff --git a/UBI/13/Dockerfile.postgis-multiarch.ubi9 b/UBI/13/Dockerfile.postgis-multiarch.ubi9
index 1085caa8..f789940e 100644
--- a/UBI/13/Dockerfile.postgis-multiarch.ubi9
+++ b/UBI/13/Dockerfile.postgis-multiarch.ubi9
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:9.4-1214
+FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="13.16" \
-      release="21" \
+      version="13.18" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 
@@ -22,6 +22,7 @@ RUN --mount=type=secret,id=cs_token \
 	pg_squeeze_pkg="pg_squeeze_13" ; \
 	pgvector="pgvector_13" ; \
 	pg_audit_pkg="pgaudit15_13" ; \
+	wal2json_pkg="wal2json_13" ; \
 	case $ARCH in \
 			amd64) \
 					yum -y install "${base_url}/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \
@@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg13-pg-squeeze1" ; \
 					pgvector="edb-pg13-pgvector0" ; \
 					pg_audit_pkg="edb-pg13-pgaudit1" ; \
+					wal2json_pkg="edb-pg13-wal2json2" ; \
 					if [ "13" -gt "15" ]; then pg_audit_pkg="edb-pg13-pgaudit13"; fi ;; \
 			s390x) \
 					curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \
@@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg13-pg-squeeze1" ; \
 					pgvector="edb-pg13-pgvector0" ; \
 					pg_audit_pkg="edb-pg13-pgaudit1" ; \
+					wal2json_pkg="edb-pg13-wal2json2" ; \
 					if [ "13" -gt "15" ]; then pg_audit_pkg="edb-pg13-pgaudit13"; fi ;; \
 			*) \
 					exit 1 ;; \
@@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-			postgresql13-13.16 \
-			postgresql13-contrib-13.16 \
-			postgresql13-server-13.16 \
-			postgresql13-libs-13.16 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+			postgresql13-13.18 \
+			postgresql13-contrib-13.18 \
+			postgresql13-server-13.18 \
+			postgresql13-libs-13.18 \
 			"$pg_audit_pkg" \
 			"$pg_squeeze_pkg" \
 			"$pg_failover_slots_pkg" \
 			"$pgvector" \
+			"$wal2json_pkg" \
 	; \
 	rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \
 	rm -fr /tmp/* ; \
@@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -122,7 +126,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis34_13-3.4.2 \
 		"$pgrouting_pkg" \
 	; \
diff --git a/UBI/13/Dockerfile.postgis-multilang.ubi8 b/UBI/13/Dockerfile.postgis-multilang.ubi8
index 2b307c39..46544497 100644
--- a/UBI/13/Dockerfile.postgis-multilang.ubi8
+++ b/UBI/13/Dockerfile.postgis-multilang.ubi8
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1054
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="13.16" \
-      release="20" \
+      version="13.18" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
@@ -31,23 +31,24 @@ RUN set -xe ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql13-13.16 \
-		postgresql13-contrib-13.16 \
-		postgresql13-server-13.16 \
-		postgresql13-libs-13.16 \
+	yum -y --setopt=install_weak_deps=0 install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql13-13.18 \
+		postgresql13-contrib-13.18 \
+		postgresql13-server-13.18 \
+		postgresql13-libs-13.18 \
 		pg_failover_slots_13 \
 		pg_squeeze_13 \
 		"$pg_audit_pkg" \
 		pgvector_13 \
+		wal2json_13 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -91,7 +92,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_13-3.4.2 \
 		pgrouting_13 \
 	; \
diff --git a/UBI/13/Dockerfile.postgis-multilang.ubi9 b/UBI/13/Dockerfile.postgis-multilang.ubi9
index d409417d..e3b647c7 100644
--- a/UBI/13/Dockerfile.postgis-multilang.ubi9
+++ b/UBI/13/Dockerfile.postgis-multilang.ubi9
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:9.4-1214
+FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="13.16" \
-      release="21" \
+      version="13.18" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 
@@ -31,23 +31,24 @@ RUN set -xe ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql13-13.16 \
-		postgresql13-contrib-13.16 \
-		postgresql13-server-13.16 \
-		postgresql13-libs-13.16 \
+	yum -y --setopt=install_weak_deps=0 install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql13-13.18 \
+		postgresql13-contrib-13.18 \
+		postgresql13-server-13.18 \
+		postgresql13-libs-13.18 \
 		pg_failover_slots_13 \
 		pg_squeeze_13 \
 		"$pg_audit_pkg" \
 		pgvector_13 \
+		wal2json_13 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -91,7 +92,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis34_13-3.4.2 \
 		pgrouting_13 \
 	; \
diff --git a/UBI/13/Dockerfile.postgis.ubi8 b/UBI/13/Dockerfile.postgis.ubi8
index 64b5e834..3a52a598 100644
--- a/UBI/13/Dockerfile.postgis.ubi8
+++ b/UBI/13/Dockerfile.postgis.ubi8
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1054
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="13.16" \
-      release="20" \
+      version="13.18" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
@@ -30,23 +30,24 @@ RUN set -xe ; \
 	esac ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql13-13.16 \
-		postgresql13-contrib-13.16 \
-		postgresql13-server-13.16 \
-		postgresql13-libs-13.16 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql13-13.18 \
+		postgresql13-contrib-13.18 \
+		postgresql13-server-13.18 \
+		postgresql13-libs-13.18 \
 		pg_failover_slots_13 \
 		pg_squeeze_13 \
 		"$pg_audit_pkg" \
 		pgvector_13 \
+		wal2json_13 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -90,7 +91,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_13-3.4.2 \
 		pgrouting_13 \
 	; \
diff --git a/UBI/13/Dockerfile.postgis.ubi9 b/UBI/13/Dockerfile.postgis.ubi9
index de12ecc2..30eae6fc 100644
--- a/UBI/13/Dockerfile.postgis.ubi9
+++ b/UBI/13/Dockerfile.postgis.ubi9
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:9.4-1214
+FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="13.16" \
-      release="21" \
+      version="13.18" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 
@@ -30,23 +30,24 @@ RUN set -xe ; \
 	esac ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql13-13.16 \
-		postgresql13-contrib-13.16 \
-		postgresql13-server-13.16 \
-		postgresql13-libs-13.16 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql13-13.18 \
+		postgresql13-contrib-13.18 \
+		postgresql13-server-13.18 \
+		postgresql13-libs-13.18 \
 		pg_failover_slots_13 \
 		pg_squeeze_13 \
 		"$pg_audit_pkg" \
 		pgvector_13 \
+		wal2json_13 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -90,7 +91,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis34_13-3.4.2 \
 		pgrouting_13 \
 	; \
diff --git a/UBI/14/.versions-postgis-ubi8.json b/UBI/14/.versions-postgis-ubi8.json
index 0503e236..c52bac05 100644
--- a/UBI/14/.versions-postgis-ubi8.json
+++ b/UBI/14/.versions-postgis-ubi8.json
@@ -1,7 +1,7 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "20",
+  "IMAGE_RELEASE_VERSION": "1",
   "POSTGIS_VERSION": "3.4.2",
-  "POSTGRES_VERSION": "14.13",
-  "UBI_VERSION": "8.10-1054"
+  "POSTGRES_VERSION": "14.15",
+  "UBI_VERSION": "8.10-1132.1731461736"
 }
diff --git a/UBI/14/.versions-postgis-ubi9.json b/UBI/14/.versions-postgis-ubi9.json
index 57180184..b4ace869 100644
--- a/UBI/14/.versions-postgis-ubi9.json
+++ b/UBI/14/.versions-postgis-ubi9.json
@@ -1,7 +1,7 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "21",
+  "IMAGE_RELEASE_VERSION": "1",
   "POSTGIS_VERSION": "3.4.2",
-  "POSTGRES_VERSION": "14.13",
-  "UBI_VERSION": "9.4-1214"
+  "POSTGRES_VERSION": "14.15",
+  "UBI_VERSION": "9.5-1731517889"
 }
diff --git a/UBI/14/Dockerfile.postgis-multiarch.ubi8 b/UBI/14/Dockerfile.postgis-multiarch.ubi8
index 04d7e604..84846454 100644
--- a/UBI/14/Dockerfile.postgis-multiarch.ubi8
+++ b/UBI/14/Dockerfile.postgis-multiarch.ubi8
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1054
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="14.13" \
-      release="20" \
+      version="14.15" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
@@ -22,6 +22,7 @@ RUN --mount=type=secret,id=cs_token \
 	pg_squeeze_pkg="pg_squeeze_14" ; \
 	pgvector="pgvector_14" ; \
 	pg_audit_pkg="pgaudit16_14" ; \
+	wal2json_pkg="wal2json_14" ; \
 	case $ARCH in \
 			amd64) \
 					yum -y install "${base_url}/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \
@@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg14-pg-squeeze1" ; \
 					pgvector="edb-pg14-pgvector0" ; \
 					pg_audit_pkg="edb-pg14-pgaudit1" ; \
+					wal2json_pkg="edb-pg14-wal2json2" ; \
 					if [ "14" -gt "15" ]; then pg_audit_pkg="edb-pg14-pgaudit14"; fi ;; \
 			s390x) \
 					curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \
@@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg14-pg-squeeze1" ; \
 					pgvector="edb-pg14-pgvector0" ; \
 					pg_audit_pkg="edb-pg14-pgaudit1" ; \
+					wal2json_pkg="edb-pg14-wal2json2" ; \
 					if [ "14" -gt "15" ]; then pg_audit_pkg="edb-pg14-pgaudit14"; fi ;; \
 			*) \
 					exit 1 ;; \
@@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-			postgresql14-14.13 \
-			postgresql14-contrib-14.13 \
-			postgresql14-server-14.13 \
-			postgresql14-libs-14.13 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+			postgresql14-14.15 \
+			postgresql14-contrib-14.15 \
+			postgresql14-server-14.15 \
+			postgresql14-libs-14.15 \
 			"$pg_audit_pkg" \
 			"$pg_squeeze_pkg" \
 			"$pg_failover_slots_pkg" \
 			"$pgvector" \
+			"$wal2json_pkg" \
 	; \
 	rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \
 	rm -fr /tmp/* ; \
@@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -122,7 +126,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_14-3.4.2 \
 		"$pgrouting_pkg" \
 	; \
diff --git a/UBI/14/Dockerfile.postgis-multiarch.ubi9 b/UBI/14/Dockerfile.postgis-multiarch.ubi9
index 9a51a01a..5548a21d 100644
--- a/UBI/14/Dockerfile.postgis-multiarch.ubi9
+++ b/UBI/14/Dockerfile.postgis-multiarch.ubi9
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:9.4-1214
+FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="14.13" \
-      release="21" \
+      version="14.15" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 
@@ -22,6 +22,7 @@ RUN --mount=type=secret,id=cs_token \
 	pg_squeeze_pkg="pg_squeeze_14" ; \
 	pgvector="pgvector_14" ; \
 	pg_audit_pkg="pgaudit16_14" ; \
+	wal2json_pkg="wal2json_14" ; \
 	case $ARCH in \
 			amd64) \
 					yum -y install "${base_url}/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \
@@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg14-pg-squeeze1" ; \
 					pgvector="edb-pg14-pgvector0" ; \
 					pg_audit_pkg="edb-pg14-pgaudit1" ; \
+					wal2json_pkg="edb-pg14-wal2json2" ; \
 					if [ "14" -gt "15" ]; then pg_audit_pkg="edb-pg14-pgaudit14"; fi ;; \
 			s390x) \
 					curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \
@@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg14-pg-squeeze1" ; \
 					pgvector="edb-pg14-pgvector0" ; \
 					pg_audit_pkg="edb-pg14-pgaudit1" ; \
+					wal2json_pkg="edb-pg14-wal2json2" ; \
 					if [ "14" -gt "15" ]; then pg_audit_pkg="edb-pg14-pgaudit14"; fi ;; \
 			*) \
 					exit 1 ;; \
@@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-			postgresql14-14.13 \
-			postgresql14-contrib-14.13 \
-			postgresql14-server-14.13 \
-			postgresql14-libs-14.13 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+			postgresql14-14.15 \
+			postgresql14-contrib-14.15 \
+			postgresql14-server-14.15 \
+			postgresql14-libs-14.15 \
 			"$pg_audit_pkg" \
 			"$pg_squeeze_pkg" \
 			"$pg_failover_slots_pkg" \
 			"$pgvector" \
+			"$wal2json_pkg" \
 	; \
 	rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \
 	rm -fr /tmp/* ; \
@@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -122,7 +126,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis34_14-3.4.2 \
 		"$pgrouting_pkg" \
 	; \
diff --git a/UBI/14/Dockerfile.postgis-multilang.ubi8 b/UBI/14/Dockerfile.postgis-multilang.ubi8
index 3a82682b..16c95369 100644
--- a/UBI/14/Dockerfile.postgis-multilang.ubi8
+++ b/UBI/14/Dockerfile.postgis-multilang.ubi8
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1054
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="14.13" \
-      release="20" \
+      version="14.15" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
@@ -31,23 +31,24 @@ RUN set -xe ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql14-14.13 \
-		postgresql14-contrib-14.13 \
-		postgresql14-server-14.13 \
-		postgresql14-libs-14.13 \
+	yum -y --setopt=install_weak_deps=0 install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql14-14.15 \
+		postgresql14-contrib-14.15 \
+		postgresql14-server-14.15 \
+		postgresql14-libs-14.15 \
 		pg_failover_slots_14 \
 		pg_squeeze_14 \
 		"$pg_audit_pkg" \
 		pgvector_14 \
+		wal2json_14 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -91,7 +92,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_14-3.4.2 \
 		pgrouting_14 \
 	; \
diff --git a/UBI/14/Dockerfile.postgis-multilang.ubi9 b/UBI/14/Dockerfile.postgis-multilang.ubi9
index 95f5b102..a458b401 100644
--- a/UBI/14/Dockerfile.postgis-multilang.ubi9
+++ b/UBI/14/Dockerfile.postgis-multilang.ubi9
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:9.4-1214
+FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="14.13" \
-      release="21" \
+      version="14.15" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 
@@ -31,23 +31,24 @@ RUN set -xe ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql14-14.13 \
-		postgresql14-contrib-14.13 \
-		postgresql14-server-14.13 \
-		postgresql14-libs-14.13 \
+	yum -y --setopt=install_weak_deps=0 install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql14-14.15 \
+		postgresql14-contrib-14.15 \
+		postgresql14-server-14.15 \
+		postgresql14-libs-14.15 \
 		pg_failover_slots_14 \
 		pg_squeeze_14 \
 		"$pg_audit_pkg" \
 		pgvector_14 \
+		wal2json_14 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -91,7 +92,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis34_14-3.4.2 \
 		pgrouting_14 \
 	; \
diff --git a/UBI/14/Dockerfile.postgis.ubi8 b/UBI/14/Dockerfile.postgis.ubi8
index f9caf8a1..8358d177 100644
--- a/UBI/14/Dockerfile.postgis.ubi8
+++ b/UBI/14/Dockerfile.postgis.ubi8
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1054
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="14.13" \
-      release="20" \
+      version="14.15" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
@@ -30,23 +30,24 @@ RUN set -xe ; \
 	esac ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql14-14.13 \
-		postgresql14-contrib-14.13 \
-		postgresql14-server-14.13 \
-		postgresql14-libs-14.13 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql14-14.15 \
+		postgresql14-contrib-14.15 \
+		postgresql14-server-14.15 \
+		postgresql14-libs-14.15 \
 		pg_failover_slots_14 \
 		pg_squeeze_14 \
 		"$pg_audit_pkg" \
 		pgvector_14 \
+		wal2json_14 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -90,7 +91,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_14-3.4.2 \
 		pgrouting_14 \
 	; \
diff --git a/UBI/14/Dockerfile.postgis.ubi9 b/UBI/14/Dockerfile.postgis.ubi9
index 72d1bed9..69cd9f3a 100644
--- a/UBI/14/Dockerfile.postgis.ubi9
+++ b/UBI/14/Dockerfile.postgis.ubi9
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:9.4-1214
+FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="14.13" \
-      release="21" \
+      version="14.15" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 
@@ -30,23 +30,24 @@ RUN set -xe ; \
 	esac ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql14-14.13 \
-		postgresql14-contrib-14.13 \
-		postgresql14-server-14.13 \
-		postgresql14-libs-14.13 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql14-14.15 \
+		postgresql14-contrib-14.15 \
+		postgresql14-server-14.15 \
+		postgresql14-libs-14.15 \
 		pg_failover_slots_14 \
 		pg_squeeze_14 \
 		"$pg_audit_pkg" \
 		pgvector_14 \
+		wal2json_14 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -90,7 +91,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis34_14-3.4.2 \
 		pgrouting_14 \
 	; \
diff --git a/UBI/15/.versions-postgis-ubi8.json b/UBI/15/.versions-postgis-ubi8.json
index 08c3f418..83423fc7 100644
--- a/UBI/15/.versions-postgis-ubi8.json
+++ b/UBI/15/.versions-postgis-ubi8.json
@@ -1,7 +1,7 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "20",
+  "IMAGE_RELEASE_VERSION": "1",
   "POSTGIS_VERSION": "3.4.2",
-  "POSTGRES_VERSION": "15.8",
-  "UBI_VERSION": "8.10-1054"
+  "POSTGRES_VERSION": "15.10",
+  "UBI_VERSION": "8.10-1132.1731461736"
 }
diff --git a/UBI/15/.versions-postgis-ubi9.json b/UBI/15/.versions-postgis-ubi9.json
index 21b8d09b..94d027de 100644
--- a/UBI/15/.versions-postgis-ubi9.json
+++ b/UBI/15/.versions-postgis-ubi9.json
@@ -1,7 +1,7 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "21",
+  "IMAGE_RELEASE_VERSION": "1",
   "POSTGIS_VERSION": "3.4.2",
-  "POSTGRES_VERSION": "15.8",
-  "UBI_VERSION": "9.4-1214"
+  "POSTGRES_VERSION": "15.10",
+  "UBI_VERSION": "9.5-1731517889"
 }
diff --git a/UBI/15/Dockerfile.postgis-multiarch.ubi8 b/UBI/15/Dockerfile.postgis-multiarch.ubi8
index a9373d86..cf994db4 100644
--- a/UBI/15/Dockerfile.postgis-multiarch.ubi8
+++ b/UBI/15/Dockerfile.postgis-multiarch.ubi8
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1054
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="15.8" \
-      release="20" \
+      version="15.10" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
@@ -22,6 +22,7 @@ RUN --mount=type=secret,id=cs_token \
 	pg_squeeze_pkg="pg_squeeze_15" ; \
 	pgvector="pgvector_15" ; \
 	pg_audit_pkg="pgaudit17_15" ; \
+	wal2json_pkg="wal2json_15" ; \
 	case $ARCH in \
 			amd64) \
 					yum -y install "${base_url}/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \
@@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg15-pg-squeeze1" ; \
 					pgvector="edb-pg15-pgvector0" ; \
 					pg_audit_pkg="edb-pg15-pgaudit1" ; \
+					wal2json_pkg="edb-pg15-wal2json2" ; \
 					if [ "15" -gt "15" ]; then pg_audit_pkg="edb-pg15-pgaudit15"; fi ;; \
 			s390x) \
 					curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \
@@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg15-pg-squeeze1" ; \
 					pgvector="edb-pg15-pgvector0" ; \
 					pg_audit_pkg="edb-pg15-pgaudit1" ; \
+					wal2json_pkg="edb-pg15-wal2json2" ; \
 					if [ "15" -gt "15" ]; then pg_audit_pkg="edb-pg15-pgaudit15"; fi ;; \
 			*) \
 					exit 1 ;; \
@@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-			postgresql15-15.8 \
-			postgresql15-contrib-15.8 \
-			postgresql15-server-15.8 \
-			postgresql15-libs-15.8 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+			postgresql15-15.10 \
+			postgresql15-contrib-15.10 \
+			postgresql15-server-15.10 \
+			postgresql15-libs-15.10 \
 			"$pg_audit_pkg" \
 			"$pg_squeeze_pkg" \
 			"$pg_failover_slots_pkg" \
 			"$pgvector" \
+			"$wal2json_pkg" \
 	; \
 	rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \
 	rm -fr /tmp/* ; \
@@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -122,7 +126,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_15-3.4.2 \
 		"$pgrouting_pkg" \
 	; \
diff --git a/UBI/15/Dockerfile.postgis-multiarch.ubi9 b/UBI/15/Dockerfile.postgis-multiarch.ubi9
index ec68fbb0..a5133738 100644
--- a/UBI/15/Dockerfile.postgis-multiarch.ubi9
+++ b/UBI/15/Dockerfile.postgis-multiarch.ubi9
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:9.4-1214
+FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="15.8" \
-      release="21" \
+      version="15.10" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 
@@ -22,6 +22,7 @@ RUN --mount=type=secret,id=cs_token \
 	pg_squeeze_pkg="pg_squeeze_15" ; \
 	pgvector="pgvector_15" ; \
 	pg_audit_pkg="pgaudit17_15" ; \
+	wal2json_pkg="wal2json_15" ; \
 	case $ARCH in \
 			amd64) \
 					yum -y install "${base_url}/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \
@@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg15-pg-squeeze1" ; \
 					pgvector="edb-pg15-pgvector0" ; \
 					pg_audit_pkg="edb-pg15-pgaudit1" ; \
+					wal2json_pkg="edb-pg15-wal2json2" ; \
 					if [ "15" -gt "15" ]; then pg_audit_pkg="edb-pg15-pgaudit15"; fi ;; \
 			s390x) \
 					curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \
@@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg15-pg-squeeze1" ; \
 					pgvector="edb-pg15-pgvector0" ; \
 					pg_audit_pkg="edb-pg15-pgaudit1" ; \
+					wal2json_pkg="edb-pg15-wal2json2" ; \
 					if [ "15" -gt "15" ]; then pg_audit_pkg="edb-pg15-pgaudit15"; fi ;; \
 			*) \
 					exit 1 ;; \
@@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-			postgresql15-15.8 \
-			postgresql15-contrib-15.8 \
-			postgresql15-server-15.8 \
-			postgresql15-libs-15.8 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+			postgresql15-15.10 \
+			postgresql15-contrib-15.10 \
+			postgresql15-server-15.10 \
+			postgresql15-libs-15.10 \
 			"$pg_audit_pkg" \
 			"$pg_squeeze_pkg" \
 			"$pg_failover_slots_pkg" \
 			"$pgvector" \
+			"$wal2json_pkg" \
 	; \
 	rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \
 	rm -fr /tmp/* ; \
@@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -122,7 +126,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis34_15-3.4.2 \
 		"$pgrouting_pkg" \
 	; \
diff --git a/UBI/15/Dockerfile.postgis-multilang.ubi8 b/UBI/15/Dockerfile.postgis-multilang.ubi8
index 4d8d07f8..89c25283 100644
--- a/UBI/15/Dockerfile.postgis-multilang.ubi8
+++ b/UBI/15/Dockerfile.postgis-multilang.ubi8
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1054
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="15.8" \
-      release="20" \
+      version="15.10" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
@@ -31,23 +31,24 @@ RUN set -xe ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql15-15.8 \
-		postgresql15-contrib-15.8 \
-		postgresql15-server-15.8 \
-		postgresql15-libs-15.8 \
+	yum -y --setopt=install_weak_deps=0 install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql15-15.10 \
+		postgresql15-contrib-15.10 \
+		postgresql15-server-15.10 \
+		postgresql15-libs-15.10 \
 		pg_failover_slots_15 \
 		pg_squeeze_15 \
 		"$pg_audit_pkg" \
 		pgvector_15 \
+		wal2json_15 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -91,7 +92,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_15-3.4.2 \
 		pgrouting_15 \
 	; \
diff --git a/UBI/15/Dockerfile.postgis-multilang.ubi9 b/UBI/15/Dockerfile.postgis-multilang.ubi9
index 8fac3517..f1ca691f 100644
--- a/UBI/15/Dockerfile.postgis-multilang.ubi9
+++ b/UBI/15/Dockerfile.postgis-multilang.ubi9
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:9.4-1214
+FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="15.8" \
-      release="21" \
+      version="15.10" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 
@@ -31,23 +31,24 @@ RUN set -xe ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql15-15.8 \
-		postgresql15-contrib-15.8 \
-		postgresql15-server-15.8 \
-		postgresql15-libs-15.8 \
+	yum -y --setopt=install_weak_deps=0 install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql15-15.10 \
+		postgresql15-contrib-15.10 \
+		postgresql15-server-15.10 \
+		postgresql15-libs-15.10 \
 		pg_failover_slots_15 \
 		pg_squeeze_15 \
 		"$pg_audit_pkg" \
 		pgvector_15 \
+		wal2json_15 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -91,7 +92,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis34_15-3.4.2 \
 		pgrouting_15 \
 	; \
diff --git a/UBI/15/Dockerfile.postgis.ubi8 b/UBI/15/Dockerfile.postgis.ubi8
index afa01ea3..05a17a29 100644
--- a/UBI/15/Dockerfile.postgis.ubi8
+++ b/UBI/15/Dockerfile.postgis.ubi8
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1054
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="15.8" \
-      release="20" \
+      version="15.10" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
@@ -30,23 +30,24 @@ RUN set -xe ; \
 	esac ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql15-15.8 \
-		postgresql15-contrib-15.8 \
-		postgresql15-server-15.8 \
-		postgresql15-libs-15.8 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql15-15.10 \
+		postgresql15-contrib-15.10 \
+		postgresql15-server-15.10 \
+		postgresql15-libs-15.10 \
 		pg_failover_slots_15 \
 		pg_squeeze_15 \
 		"$pg_audit_pkg" \
 		pgvector_15 \
+		wal2json_15 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -90,7 +91,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_15-3.4.2 \
 		pgrouting_15 \
 	; \
diff --git a/UBI/15/Dockerfile.postgis.ubi9 b/UBI/15/Dockerfile.postgis.ubi9
index bac0e965..ba867c3a 100644
--- a/UBI/15/Dockerfile.postgis.ubi9
+++ b/UBI/15/Dockerfile.postgis.ubi9
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:9.4-1214
+FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="15.8" \
-      release="21" \
+      version="15.10" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 
@@ -30,23 +30,24 @@ RUN set -xe ; \
 	esac ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql15-15.8 \
-		postgresql15-contrib-15.8 \
-		postgresql15-server-15.8 \
-		postgresql15-libs-15.8 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql15-15.10 \
+		postgresql15-contrib-15.10 \
+		postgresql15-server-15.10 \
+		postgresql15-libs-15.10 \
 		pg_failover_slots_15 \
 		pg_squeeze_15 \
 		"$pg_audit_pkg" \
 		pgvector_15 \
+		wal2json_15 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -90,7 +91,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis34_15-3.4.2 \
 		pgrouting_15 \
 	; \
diff --git a/UBI/16/.versions-postgis-ubi8.json b/UBI/16/.versions-postgis-ubi8.json
index 604cb65f..5911d8ae 100644
--- a/UBI/16/.versions-postgis-ubi8.json
+++ b/UBI/16/.versions-postgis-ubi8.json
@@ -1,7 +1,7 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "20",
+  "IMAGE_RELEASE_VERSION": "1",
   "POSTGIS_VERSION": "3.4.2",
-  "POSTGRES_VERSION": "16.4",
-  "UBI_VERSION": "8.10-1054"
+  "POSTGRES_VERSION": "16.6",
+  "UBI_VERSION": "8.10-1132.1731461736"
 }
diff --git a/UBI/16/.versions-postgis-ubi9.json b/UBI/16/.versions-postgis-ubi9.json
index 491d87dd..e85a2156 100644
--- a/UBI/16/.versions-postgis-ubi9.json
+++ b/UBI/16/.versions-postgis-ubi9.json
@@ -1,7 +1,7 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "21",
+  "IMAGE_RELEASE_VERSION": "1",
   "POSTGIS_VERSION": "3.4.2",
-  "POSTGRES_VERSION": "16.4",
-  "UBI_VERSION": "9.4-1214"
+  "POSTGRES_VERSION": "16.6",
+  "UBI_VERSION": "9.5-1731517889"
 }
diff --git a/UBI/16/Dockerfile.postgis-multiarch.ubi8 b/UBI/16/Dockerfile.postgis-multiarch.ubi8
index cdb1633c..1cf08b1d 100644
--- a/UBI/16/Dockerfile.postgis-multiarch.ubi8
+++ b/UBI/16/Dockerfile.postgis-multiarch.ubi8
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1054
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="16.4" \
-      release="20" \
+      version="16.6" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
@@ -22,6 +22,7 @@ RUN --mount=type=secret,id=cs_token \
 	pg_squeeze_pkg="pg_squeeze_16" ; \
 	pgvector="pgvector_16" ; \
 	pg_audit_pkg="pgaudit18_16" ; \
+	wal2json_pkg="wal2json_16" ; \
 	case $ARCH in \
 			amd64) \
 					yum -y install "${base_url}/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \
@@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg16-pg-squeeze1" ; \
 					pgvector="edb-pg16-pgvector0" ; \
 					pg_audit_pkg="edb-pg16-pgaudit1" ; \
+					wal2json_pkg="edb-pg16-wal2json2" ; \
 					if [ "16" -gt "15" ]; then pg_audit_pkg="edb-pg16-pgaudit16"; fi ;; \
 			s390x) \
 					curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \
@@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg16-pg-squeeze1" ; \
 					pgvector="edb-pg16-pgvector0" ; \
 					pg_audit_pkg="edb-pg16-pgaudit1" ; \
+					wal2json_pkg="edb-pg16-wal2json2" ; \
 					if [ "16" -gt "15" ]; then pg_audit_pkg="edb-pg16-pgaudit16"; fi ;; \
 			*) \
 					exit 1 ;; \
@@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-			postgresql16-16.4 \
-			postgresql16-contrib-16.4 \
-			postgresql16-server-16.4 \
-			postgresql16-libs-16.4 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+			postgresql16-16.6 \
+			postgresql16-contrib-16.6 \
+			postgresql16-server-16.6 \
+			postgresql16-libs-16.6 \
 			"$pg_audit_pkg" \
 			"$pg_squeeze_pkg" \
 			"$pg_failover_slots_pkg" \
 			"$pgvector" \
+			"$wal2json_pkg" \
 	; \
 	rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \
 	rm -fr /tmp/* ; \
@@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -122,7 +126,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_16-3.4.2 \
 		"$pgrouting_pkg" \
 	; \
diff --git a/UBI/16/Dockerfile.postgis-multiarch.ubi9 b/UBI/16/Dockerfile.postgis-multiarch.ubi9
index 16e9a5d6..5c0a6ffb 100644
--- a/UBI/16/Dockerfile.postgis-multiarch.ubi9
+++ b/UBI/16/Dockerfile.postgis-multiarch.ubi9
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:9.4-1214
+FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="16.4" \
-      release="21" \
+      version="16.6" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 
@@ -22,6 +22,7 @@ RUN --mount=type=secret,id=cs_token \
 	pg_squeeze_pkg="pg_squeeze_16" ; \
 	pgvector="pgvector_16" ; \
 	pg_audit_pkg="pgaudit18_16" ; \
+	wal2json_pkg="wal2json_16" ; \
 	case $ARCH in \
 			amd64) \
 					yum -y install "${base_url}/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \
@@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg16-pg-squeeze1" ; \
 					pgvector="edb-pg16-pgvector0" ; \
 					pg_audit_pkg="edb-pg16-pgaudit1" ; \
+					wal2json_pkg="edb-pg16-wal2json2" ; \
 					if [ "16" -gt "15" ]; then pg_audit_pkg="edb-pg16-pgaudit16"; fi ;; \
 			s390x) \
 					curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \
@@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg16-pg-squeeze1" ; \
 					pgvector="edb-pg16-pgvector0" ; \
 					pg_audit_pkg="edb-pg16-pgaudit1" ; \
+					wal2json_pkg="edb-pg16-wal2json2" ; \
 					if [ "16" -gt "15" ]; then pg_audit_pkg="edb-pg16-pgaudit16"; fi ;; \
 			*) \
 					exit 1 ;; \
@@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-			postgresql16-16.4 \
-			postgresql16-contrib-16.4 \
-			postgresql16-server-16.4 \
-			postgresql16-libs-16.4 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+			postgresql16-16.6 \
+			postgresql16-contrib-16.6 \
+			postgresql16-server-16.6 \
+			postgresql16-libs-16.6 \
 			"$pg_audit_pkg" \
 			"$pg_squeeze_pkg" \
 			"$pg_failover_slots_pkg" \
 			"$pgvector" \
+			"$wal2json_pkg" \
 	; \
 	rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \
 	rm -fr /tmp/* ; \
@@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -122,7 +126,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis34_16-3.4.2 \
 		"$pgrouting_pkg" \
 	; \
diff --git a/UBI/16/Dockerfile.postgis-multilang.ubi8 b/UBI/16/Dockerfile.postgis-multilang.ubi8
index aa4cbfc7..eb91b74c 100644
--- a/UBI/16/Dockerfile.postgis-multilang.ubi8
+++ b/UBI/16/Dockerfile.postgis-multilang.ubi8
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1054
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="16.4" \
-      release="20" \
+      version="16.6" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
@@ -31,23 +31,24 @@ RUN set -xe ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql16-16.4 \
-		postgresql16-contrib-16.4 \
-		postgresql16-server-16.4 \
-		postgresql16-libs-16.4 \
+	yum -y --setopt=install_weak_deps=0 install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql16-16.6 \
+		postgresql16-contrib-16.6 \
+		postgresql16-server-16.6 \
+		postgresql16-libs-16.6 \
 		pg_failover_slots_16 \
 		pg_squeeze_16 \
 		"$pg_audit_pkg" \
 		pgvector_16 \
+		wal2json_16 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -91,7 +92,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_16-3.4.2 \
 		pgrouting_16 \
 	; \
diff --git a/UBI/16/Dockerfile.postgis-multilang.ubi9 b/UBI/16/Dockerfile.postgis-multilang.ubi9
index f5afc4ad..6e42ed1c 100644
--- a/UBI/16/Dockerfile.postgis-multilang.ubi9
+++ b/UBI/16/Dockerfile.postgis-multilang.ubi9
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:9.4-1214
+FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="16.4" \
-      release="21" \
+      version="16.6" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 
@@ -31,23 +31,24 @@ RUN set -xe ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql16-16.4 \
-		postgresql16-contrib-16.4 \
-		postgresql16-server-16.4 \
-		postgresql16-libs-16.4 \
+	yum -y --setopt=install_weak_deps=0 install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql16-16.6 \
+		postgresql16-contrib-16.6 \
+		postgresql16-server-16.6 \
+		postgresql16-libs-16.6 \
 		pg_failover_slots_16 \
 		pg_squeeze_16 \
 		"$pg_audit_pkg" \
 		pgvector_16 \
+		wal2json_16 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -91,7 +92,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis34_16-3.4.2 \
 		pgrouting_16 \
 	; \
diff --git a/UBI/16/Dockerfile.postgis.ubi8 b/UBI/16/Dockerfile.postgis.ubi8
index 6a46bda2..06b257d6 100644
--- a/UBI/16/Dockerfile.postgis.ubi8
+++ b/UBI/16/Dockerfile.postgis.ubi8
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1054
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="16.4" \
-      release="20" \
+      version="16.6" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
@@ -30,23 +30,24 @@ RUN set -xe ; \
 	esac ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql16-16.4 \
-		postgresql16-contrib-16.4 \
-		postgresql16-server-16.4 \
-		postgresql16-libs-16.4 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql16-16.6 \
+		postgresql16-contrib-16.6 \
+		postgresql16-server-16.6 \
+		postgresql16-libs-16.6 \
 		pg_failover_slots_16 \
 		pg_squeeze_16 \
 		"$pg_audit_pkg" \
 		pgvector_16 \
+		wal2json_16 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -90,7 +91,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_16-3.4.2 \
 		pgrouting_16 \
 	; \
diff --git a/UBI/16/Dockerfile.postgis.ubi9 b/UBI/16/Dockerfile.postgis.ubi9
index 5b3e29fb..a34626ae 100644
--- a/UBI/16/Dockerfile.postgis.ubi9
+++ b/UBI/16/Dockerfile.postgis.ubi9
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:9.4-1214
+FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="16.4" \
-      release="21" \
+      version="16.6" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 
@@ -30,23 +30,24 @@ RUN set -xe ; \
 	esac ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql16-16.4 \
-		postgresql16-contrib-16.4 \
-		postgresql16-server-16.4 \
-		postgresql16-libs-16.4 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql16-16.6 \
+		postgresql16-contrib-16.6 \
+		postgresql16-server-16.6 \
+		postgresql16-libs-16.6 \
 		pg_failover_slots_16 \
 		pg_squeeze_16 \
 		"$pg_audit_pkg" \
 		pgvector_16 \
+		wal2json_16 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -90,7 +91,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis34_16-3.4.2 \
 		pgrouting_16 \
 	; \
diff --git a/UBI/17/.versions-postgis-ubi8.json b/UBI/17/.versions-postgis-ubi8.json
index 9f8ff009..85d1c3ad 100644
--- a/UBI/17/.versions-postgis-ubi8.json
+++ b/UBI/17/.versions-postgis-ubi8.json
@@ -2,6 +2,6 @@
   "BARMAN_VERSION": "3.11.1",
   "IMAGE_RELEASE_VERSION": "1",
   "POSTGIS_VERSION": "3.5.0",
-  "POSTGRES_VERSION": "17.0",
-  "UBI_VERSION": "8.10-1088"
+  "POSTGRES_VERSION": "17.2",
+  "UBI_VERSION": "8.10-1132.1731461736"
 }
diff --git a/UBI/17/.versions-postgis-ubi9.json b/UBI/17/.versions-postgis-ubi9.json
index 3fad505b..6427345b 100644
--- a/UBI/17/.versions-postgis-ubi9.json
+++ b/UBI/17/.versions-postgis-ubi9.json
@@ -2,6 +2,6 @@
   "BARMAN_VERSION": "3.11.1",
   "IMAGE_RELEASE_VERSION": "1",
   "POSTGIS_VERSION": "3.5.0",
-  "POSTGRES_VERSION": "17.0",
-  "UBI_VERSION": "9.4-1214.1726694543"
+  "POSTGRES_VERSION": "17.2",
+  "UBI_VERSION": "9.5-1731517889"
 }
diff --git a/UBI/17/Dockerfile.postgis-multiarch.ubi8 b/UBI/17/Dockerfile.postgis-multiarch.ubi8
index 6f96daf6..1c576445 100644
--- a/UBI/17/Dockerfile.postgis-multiarch.ubi8
+++ b/UBI/17/Dockerfile.postgis-multiarch.ubi8
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1088
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="17.0" \
+      version="17.2" \
       release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
@@ -22,6 +22,7 @@ RUN --mount=type=secret,id=cs_token \
 	pg_squeeze_pkg="pg_squeeze_17" ; \
 	pgvector="pgvector_17" ; \
 	pg_audit_pkg="pgaudit19_17" ; \
+	wal2json_pkg="wal2json_17" ; \
 	case $ARCH in \
 			amd64) \
 					yum -y install "${base_url}/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \
@@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg17-pg-squeeze1" ; \
 					pgvector="edb-pg17-pgvector0" ; \
 					pg_audit_pkg="edb-pg17-pgaudit1" ; \
+					wal2json_pkg="edb-pg17-wal2json2" ; \
 					if [ "17" -gt "15" ]; then pg_audit_pkg="edb-pg17-pgaudit17"; fi ;; \
 			s390x) \
 					curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \
@@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg17-pg-squeeze1" ; \
 					pgvector="edb-pg17-pgvector0" ; \
 					pg_audit_pkg="edb-pg17-pgaudit1" ; \
+					wal2json_pkg="edb-pg17-wal2json2" ; \
 					if [ "17" -gt "15" ]; then pg_audit_pkg="edb-pg17-pgaudit17"; fi ;; \
 			*) \
 					exit 1 ;; \
@@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-			postgresql17-17.0 \
-			postgresql17-contrib-17.0 \
-			postgresql17-server-17.0 \
-			postgresql17-libs-17.0 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+			postgresql17-17.2 \
+			postgresql17-contrib-17.2 \
+			postgresql17-server-17.2 \
+			postgresql17-libs-17.2 \
 			"$pg_audit_pkg" \
 			"$pg_squeeze_pkg" \
 			"$pg_failover_slots_pkg" \
 			"$pgvector" \
+			"$wal2json_pkg" \
 	; \
 	rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \
 	rm -fr /tmp/* ; \
@@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -122,7 +126,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis35_17-3.5.0 \
 		"$pgrouting_pkg" \
 	; \
diff --git a/UBI/17/Dockerfile.postgis-multiarch.ubi9 b/UBI/17/Dockerfile.postgis-multiarch.ubi9
index fb267208..1ed1b7ea 100644
--- a/UBI/17/Dockerfile.postgis-multiarch.ubi9
+++ b/UBI/17/Dockerfile.postgis-multiarch.ubi9
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:9.4-1214.1726694543
+FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="17.0" \
+      version="17.2" \
       release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
@@ -22,6 +22,7 @@ RUN --mount=type=secret,id=cs_token \
 	pg_squeeze_pkg="pg_squeeze_17" ; \
 	pgvector="pgvector_17" ; \
 	pg_audit_pkg="pgaudit19_17" ; \
+	wal2json_pkg="wal2json_17" ; \
 	case $ARCH in \
 			amd64) \
 					yum -y install "${base_url}/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \
@@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg17-pg-squeeze1" ; \
 					pgvector="edb-pg17-pgvector0" ; \
 					pg_audit_pkg="edb-pg17-pgaudit1" ; \
+					wal2json_pkg="edb-pg17-wal2json2" ; \
 					if [ "17" -gt "15" ]; then pg_audit_pkg="edb-pg17-pgaudit17"; fi ;; \
 			s390x) \
 					curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \
@@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg17-pg-squeeze1" ; \
 					pgvector="edb-pg17-pgvector0" ; \
 					pg_audit_pkg="edb-pg17-pgaudit1" ; \
+					wal2json_pkg="edb-pg17-wal2json2" ; \
 					if [ "17" -gt "15" ]; then pg_audit_pkg="edb-pg17-pgaudit17"; fi ;; \
 			*) \
 					exit 1 ;; \
@@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-			postgresql17-17.0 \
-			postgresql17-contrib-17.0 \
-			postgresql17-server-17.0 \
-			postgresql17-libs-17.0 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+			postgresql17-17.2 \
+			postgresql17-contrib-17.2 \
+			postgresql17-server-17.2 \
+			postgresql17-libs-17.2 \
 			"$pg_audit_pkg" \
 			"$pg_squeeze_pkg" \
 			"$pg_failover_slots_pkg" \
 			"$pgvector" \
+			"$wal2json_pkg" \
 	; \
 	rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \
 	rm -fr /tmp/* ; \
@@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -122,7 +126,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis35_17-3.5.0 \
 		"$pgrouting_pkg" \
 	; \
diff --git a/UBI/17/Dockerfile.postgis-multilang.ubi8 b/UBI/17/Dockerfile.postgis-multilang.ubi8
index 0456ec4f..5703fe60 100644
--- a/UBI/17/Dockerfile.postgis-multilang.ubi8
+++ b/UBI/17/Dockerfile.postgis-multilang.ubi8
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1088
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="17.0" \
+      version="17.2" \
       release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
@@ -31,23 +31,24 @@ RUN set -xe ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql17-17.0 \
-		postgresql17-contrib-17.0 \
-		postgresql17-server-17.0 \
-		postgresql17-libs-17.0 \
+	yum -y --setopt=install_weak_deps=0 install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql17-17.2 \
+		postgresql17-contrib-17.2 \
+		postgresql17-server-17.2 \
+		postgresql17-libs-17.2 \
 		pg_failover_slots_17 \
 		pg_squeeze_17 \
 		"$pg_audit_pkg" \
 		pgvector_17 \
+		wal2json_17 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -91,7 +92,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis35_17-3.5.0 \
 		pgrouting_17 \
 	; \
diff --git a/UBI/17/Dockerfile.postgis-multilang.ubi9 b/UBI/17/Dockerfile.postgis-multilang.ubi9
index fd612b55..18ff79cf 100644
--- a/UBI/17/Dockerfile.postgis-multilang.ubi9
+++ b/UBI/17/Dockerfile.postgis-multilang.ubi9
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:9.4-1214.1726694543
+FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="17.0" \
+      version="17.2" \
       release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
@@ -31,23 +31,24 @@ RUN set -xe ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql17-17.0 \
-		postgresql17-contrib-17.0 \
-		postgresql17-server-17.0 \
-		postgresql17-libs-17.0 \
+	yum -y --setopt=install_weak_deps=0 install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql17-17.2 \
+		postgresql17-contrib-17.2 \
+		postgresql17-server-17.2 \
+		postgresql17-libs-17.2 \
 		pg_failover_slots_17 \
 		pg_squeeze_17 \
 		"$pg_audit_pkg" \
 		pgvector_17 \
+		wal2json_17 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -91,7 +92,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis35_17-3.5.0 \
 		pgrouting_17 \
 	; \
diff --git a/UBI/17/Dockerfile.postgis.ubi8 b/UBI/17/Dockerfile.postgis.ubi8
index 4d3db095..c3ac1fa6 100644
--- a/UBI/17/Dockerfile.postgis.ubi8
+++ b/UBI/17/Dockerfile.postgis.ubi8
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1088
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="17.0" \
+      version="17.2" \
       release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
@@ -30,23 +30,24 @@ RUN set -xe ; \
 	esac ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql17-17.0 \
-		postgresql17-contrib-17.0 \
-		postgresql17-server-17.0 \
-		postgresql17-libs-17.0 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql17-17.2 \
+		postgresql17-contrib-17.2 \
+		postgresql17-server-17.2 \
+		postgresql17-libs-17.2 \
 		pg_failover_slots_17 \
 		pg_squeeze_17 \
 		"$pg_audit_pkg" \
 		pgvector_17 \
+		wal2json_17 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -90,7 +91,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis35_17-3.5.0 \
 		pgrouting_17 \
 	; \
diff --git a/UBI/17/Dockerfile.postgis.ubi9 b/UBI/17/Dockerfile.postgis.ubi9
index d6c935c7..dbc14d1b 100644
--- a/UBI/17/Dockerfile.postgis.ubi9
+++ b/UBI/17/Dockerfile.postgis.ubi9
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:9.4-1214.1726694543
+FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="17.0" \
+      version="17.2" \
       release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
@@ -30,23 +30,24 @@ RUN set -xe ; \
 	esac ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
-	yum -y --setopt=tsflags=nodocs install \
-		postgresql17-17.0 \
-		postgresql17-contrib-17.0 \
-		postgresql17-server-17.0 \
-		postgresql17-libs-17.0 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+		postgresql17-17.2 \
+		postgresql17-contrib-17.2 \
+		postgresql17-server-17.2 \
+		postgresql17-libs-17.2 \
 		pg_failover_slots_17 \
 		pg_squeeze_17 \
 		"$pg_audit_pkg" \
 		pgvector_17 \
+		wal2json_17 \
 	; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -90,7 +91,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
 		postgis35_17-3.5.0 \
 		pgrouting_17 \
 	; \