diff --git a/UBI/12/.versions-postgis.json b/UBI/12/.versions-postgis.json
index 96be3ba5..f16bfdf1 100644
--- a/UBI/12/.versions-postgis.json
+++ b/UBI/12/.versions-postgis.json
@@ -1,7 +1,7 @@
 {
   "BARMAN_VERSION": "3.9.0",
-  "IMAGE_RELEASE_VERSION": "1",
+  "IMAGE_RELEASE_VERSION": "2",
   "POSTGIS_VERSION": "3.4.1",
   "POSTGRES_VERSION": "12.17",
-  "UBI_VERSION": "8.8-1067.1698056881"
+  "UBI_VERSION": "8.9-1028"
 }
diff --git a/UBI/12/.versions.json b/UBI/12/.versions.json
index e5c3d731..28a5b69d 100644
--- a/UBI/12/.versions.json
+++ b/UBI/12/.versions.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.9.0",
-  "IMAGE_RELEASE_VERSION": "1",
+  "IMAGE_RELEASE_VERSION": "2",
   "POSTGRES_VERSION": "12.17",
-  "UBI_VERSION": "8.8-1067.1698056881"
+  "UBI_VERSION": "8.9-1028"
 }
diff --git a/UBI/12/Dockerfile b/UBI/12/Dockerfile
index 76a52e6f..778cd113 100644
--- a/UBI/12/Dockerfile
+++ b/UBI/12/Dockerfile
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.17" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/12/Dockerfile.multiarch b/UBI/12/Dockerfile.multiarch
index cd2870a0..c641e087 100644
--- a/UBI/12/Dockerfile.multiarch
+++ b/UBI/12/Dockerfile.multiarch
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.17" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/12/Dockerfile.multilang b/UBI/12/Dockerfile.multilang
index 9d8908ea..c4ce798b 100644
--- a/UBI/12/Dockerfile.multilang
+++ b/UBI/12/Dockerfile.multilang
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.17" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/12/Dockerfile.postgis b/UBI/12/Dockerfile.postgis
index ffd39a86..7bbb13d7 100644
--- a/UBI/12/Dockerfile.postgis
+++ b/UBI/12/Dockerfile.postgis
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.17" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/12/Dockerfile.postgis-multilang b/UBI/12/Dockerfile.postgis-multilang
index 9a992c4f..a65d9733 100644
--- a/UBI/12/Dockerfile.postgis-multilang
+++ b/UBI/12/Dockerfile.postgis-multilang
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.17" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/13/.versions-postgis.json b/UBI/13/.versions-postgis.json
index c8b8bad5..829231af 100644
--- a/UBI/13/.versions-postgis.json
+++ b/UBI/13/.versions-postgis.json
@@ -1,7 +1,7 @@
 {
   "BARMAN_VERSION": "3.9.0",
-  "IMAGE_RELEASE_VERSION": "1",
+  "IMAGE_RELEASE_VERSION": "2",
   "POSTGIS_VERSION": "3.4.1",
   "POSTGRES_VERSION": "13.13",
-  "UBI_VERSION": "8.8-1067.1698056881"
+  "UBI_VERSION": "8.9-1028"
 }
diff --git a/UBI/13/.versions.json b/UBI/13/.versions.json
index 1f76cf92..1aa45cfe 100644
--- a/UBI/13/.versions.json
+++ b/UBI/13/.versions.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.9.0",
-  "IMAGE_RELEASE_VERSION": "1",
+  "IMAGE_RELEASE_VERSION": "2",
   "POSTGRES_VERSION": "13.13",
-  "UBI_VERSION": "8.8-1067.1698056881"
+  "UBI_VERSION": "8.9-1028"
 }
diff --git a/UBI/13/Dockerfile b/UBI/13/Dockerfile
index be3f279c..ded6483d 100644
--- a/UBI/13/Dockerfile
+++ b/UBI/13/Dockerfile
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="13.13" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/13/Dockerfile.multiarch b/UBI/13/Dockerfile.multiarch
index 41343178..f29b13a8 100644
--- a/UBI/13/Dockerfile.multiarch
+++ b/UBI/13/Dockerfile.multiarch
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="13.13" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/13/Dockerfile.multilang b/UBI/13/Dockerfile.multilang
index d56d89ad..bb6bd0cc 100644
--- a/UBI/13/Dockerfile.multilang
+++ b/UBI/13/Dockerfile.multilang
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="13.13" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/13/Dockerfile.postgis b/UBI/13/Dockerfile.postgis
index e3517c45..a7244f1c 100644
--- a/UBI/13/Dockerfile.postgis
+++ b/UBI/13/Dockerfile.postgis
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="13.13" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/13/Dockerfile.postgis-multilang b/UBI/13/Dockerfile.postgis-multilang
index 82b35079..072fcb80 100644
--- a/UBI/13/Dockerfile.postgis-multilang
+++ b/UBI/13/Dockerfile.postgis-multilang
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="13.13" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/14/.versions-postgis.json b/UBI/14/.versions-postgis.json
index 7ff91334..681ee556 100644
--- a/UBI/14/.versions-postgis.json
+++ b/UBI/14/.versions-postgis.json
@@ -1,7 +1,7 @@
 {
   "BARMAN_VERSION": "3.9.0",
-  "IMAGE_RELEASE_VERSION": "1",
+  "IMAGE_RELEASE_VERSION": "2",
   "POSTGIS_VERSION": "3.4.1",
   "POSTGRES_VERSION": "14.10",
-  "UBI_VERSION": "8.8-1067.1698056881"
+  "UBI_VERSION": "8.9-1028"
 }
diff --git a/UBI/14/.versions.json b/UBI/14/.versions.json
index aad6fe1a..c137111d 100644
--- a/UBI/14/.versions.json
+++ b/UBI/14/.versions.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.9.0",
-  "IMAGE_RELEASE_VERSION": "1",
+  "IMAGE_RELEASE_VERSION": "2",
   "POSTGRES_VERSION": "14.10",
-  "UBI_VERSION": "8.8-1067.1698056881"
+  "UBI_VERSION": "8.9-1028"
 }
diff --git a/UBI/14/Dockerfile b/UBI/14/Dockerfile
index 8056fb75..9713b569 100644
--- a/UBI/14/Dockerfile
+++ b/UBI/14/Dockerfile
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="14.10" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/14/Dockerfile.multiarch b/UBI/14/Dockerfile.multiarch
index 8d297272..6ac26061 100644
--- a/UBI/14/Dockerfile.multiarch
+++ b/UBI/14/Dockerfile.multiarch
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="14.10" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/14/Dockerfile.multilang b/UBI/14/Dockerfile.multilang
index 1e89f6fd..1f86dbe7 100644
--- a/UBI/14/Dockerfile.multilang
+++ b/UBI/14/Dockerfile.multilang
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="14.10" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/14/Dockerfile.postgis b/UBI/14/Dockerfile.postgis
index 40bcd4a1..01a1ea34 100644
--- a/UBI/14/Dockerfile.postgis
+++ b/UBI/14/Dockerfile.postgis
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="14.10" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/14/Dockerfile.postgis-multilang b/UBI/14/Dockerfile.postgis-multilang
index b19a3e23..29dccfae 100644
--- a/UBI/14/Dockerfile.postgis-multilang
+++ b/UBI/14/Dockerfile.postgis-multilang
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="14.10" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/15/.versions-postgis.json b/UBI/15/.versions-postgis.json
index 09ceb309..969c155a 100644
--- a/UBI/15/.versions-postgis.json
+++ b/UBI/15/.versions-postgis.json
@@ -1,7 +1,7 @@
 {
   "BARMAN_VERSION": "3.9.0",
-  "IMAGE_RELEASE_VERSION": "1",
+  "IMAGE_RELEASE_VERSION": "2",
   "POSTGIS_VERSION": "3.4.1",
   "POSTGRES_VERSION": "15.5",
-  "UBI_VERSION": "8.8-1067.1698056881"
+  "UBI_VERSION": "8.9-1028"
 }
diff --git a/UBI/15/.versions.json b/UBI/15/.versions.json
index 365aa376..e7c21307 100644
--- a/UBI/15/.versions.json
+++ b/UBI/15/.versions.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.9.0",
-  "IMAGE_RELEASE_VERSION": "1",
+  "IMAGE_RELEASE_VERSION": "2",
   "POSTGRES_VERSION": "15.5",
-  "UBI_VERSION": "8.8-1067.1698056881"
+  "UBI_VERSION": "8.9-1028"
 }
diff --git a/UBI/15/Dockerfile b/UBI/15/Dockerfile
index 7383c124..f0756026 100644
--- a/UBI/15/Dockerfile
+++ b/UBI/15/Dockerfile
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="15.5" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/15/Dockerfile.multiarch b/UBI/15/Dockerfile.multiarch
index 3bd13a5d..c94d47e6 100644
--- a/UBI/15/Dockerfile.multiarch
+++ b/UBI/15/Dockerfile.multiarch
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="15.5" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/15/Dockerfile.multilang b/UBI/15/Dockerfile.multilang
index 7b114d02..f716b2f9 100644
--- a/UBI/15/Dockerfile.multilang
+++ b/UBI/15/Dockerfile.multilang
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="15.5" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/15/Dockerfile.postgis b/UBI/15/Dockerfile.postgis
index fd734787..380bf8d9 100644
--- a/UBI/15/Dockerfile.postgis
+++ b/UBI/15/Dockerfile.postgis
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="15.5" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/15/Dockerfile.postgis-multilang b/UBI/15/Dockerfile.postgis-multilang
index 2436083c..fdcc7be7 100644
--- a/UBI/15/Dockerfile.postgis-multilang
+++ b/UBI/15/Dockerfile.postgis-multilang
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="15.5" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/16/.versions-postgis.json b/UBI/16/.versions-postgis.json
index 272c9ca8..d29eab64 100644
--- a/UBI/16/.versions-postgis.json
+++ b/UBI/16/.versions-postgis.json
@@ -1,7 +1,7 @@
 {
   "BARMAN_VERSION": "3.9.0",
-  "IMAGE_RELEASE_VERSION": "1",
+  "IMAGE_RELEASE_VERSION": "2",
   "POSTGIS_VERSION": "3.4.1",
   "POSTGRES_VERSION": "16.1",
-  "UBI_VERSION": "8.8-1067.1698056881"
+  "UBI_VERSION": "8.9-1028"
 }
diff --git a/UBI/16/.versions.json b/UBI/16/.versions.json
index b3107e6b..69b6f2ef 100644
--- a/UBI/16/.versions.json
+++ b/UBI/16/.versions.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.9.0",
-  "IMAGE_RELEASE_VERSION": "1",
+  "IMAGE_RELEASE_VERSION": "2",
   "POSTGRES_VERSION": "16.1",
-  "UBI_VERSION": "8.8-1067.1698056881"
+  "UBI_VERSION": "8.9-1028"
 }
diff --git a/UBI/16/Dockerfile b/UBI/16/Dockerfile
index 13436aed..9cd29f62 100644
--- a/UBI/16/Dockerfile
+++ b/UBI/16/Dockerfile
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="16.1" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/16/Dockerfile.multiarch b/UBI/16/Dockerfile.multiarch
index bb389f43..9deb7ece 100644
--- a/UBI/16/Dockerfile.multiarch
+++ b/UBI/16/Dockerfile.multiarch
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="16.1" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/16/Dockerfile.multilang b/UBI/16/Dockerfile.multilang
index 0dd59c0e..888b9bc1 100644
--- a/UBI/16/Dockerfile.multilang
+++ b/UBI/16/Dockerfile.multilang
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="16.1" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/16/Dockerfile.postgis b/UBI/16/Dockerfile.postgis
index 6018d0f3..4d961b3f 100644
--- a/UBI/16/Dockerfile.postgis
+++ b/UBI/16/Dockerfile.postgis
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="16.1" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
diff --git a/UBI/16/Dockerfile.postgis-multilang b/UBI/16/Dockerfile.postgis-multilang
index 34682d84..4c984b80 100644
--- a/UBI/16/Dockerfile.postgis-multilang
+++ b/UBI/16/Dockerfile.postgis-multilang
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.8-1067.1698056881
+FROM quay.io/enterprisedb/edb-ubi:8.9-1028
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="16.1" \
-      release="1" \
+      release="2" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."