diff --git a/UBI/12/.versions-postgis.json b/UBI/12/.versions-postgis.json
index ee150d85..214c715f 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": "3",
+  "IMAGE_RELEASE_VERSION": "4",
   "POSTGIS_VERSION": "3.4.1",
   "POSTGRES_VERSION": "12.17",
-  "UBI_VERSION": "8.9-1107"
+  "UBI_VERSION": "8.9-1107.1705420509"
 }
diff --git a/UBI/12/.versions.json b/UBI/12/.versions.json
index ab1eff99..10bfe0ac 100644
--- a/UBI/12/.versions.json
+++ b/UBI/12/.versions.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.9.0",
-  "IMAGE_RELEASE_VERSION": "3",
+  "IMAGE_RELEASE_VERSION": "4",
   "POSTGRES_VERSION": "12.17",
-  "UBI_VERSION": "8.9-1107"
+  "UBI_VERSION": "8.9-1107.1705420509"
 }
diff --git a/UBI/12/Dockerfile b/UBI/12/Dockerfile
index 53ee84ae..d9e89450 100644
--- a/UBI/12/Dockerfile
+++ b/UBI/12/Dockerfile
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 
 # 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="3" \
+      release="4" \
       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 89d247c1..6067b22b 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 
 # 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="3" \
+      release="4" \
       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 95fea023..3e9c4647 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 
 # 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="3" \
+      release="4" \
       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 74007953..cfe5a608 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 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="3" \
+      release="4" \
       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 2c30e536..4c5ee456 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 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="3" \
+      release="4" \
       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 dde57965..6df0474e 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": "3",
+  "IMAGE_RELEASE_VERSION": "4",
   "POSTGIS_VERSION": "3.4.1",
   "POSTGRES_VERSION": "13.13",
-  "UBI_VERSION": "8.9-1107"
+  "UBI_VERSION": "8.9-1107.1705420509"
 }
diff --git a/UBI/13/.versions.json b/UBI/13/.versions.json
index b7c176f7..d4d562c1 100644
--- a/UBI/13/.versions.json
+++ b/UBI/13/.versions.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.9.0",
-  "IMAGE_RELEASE_VERSION": "3",
+  "IMAGE_RELEASE_VERSION": "4",
   "POSTGRES_VERSION": "13.13",
-  "UBI_VERSION": "8.9-1107"
+  "UBI_VERSION": "8.9-1107.1705420509"
 }
diff --git a/UBI/13/Dockerfile b/UBI/13/Dockerfile
index 800f1af8..a1a10bd4 100644
--- a/UBI/13/Dockerfile
+++ b/UBI/13/Dockerfile
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 
 # 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="3" \
+      release="4" \
       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 caf273be..a9f0224f 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 
 # 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="3" \
+      release="4" \
       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 5fdffa36..6537b313 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 
 # 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="3" \
+      release="4" \
       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 8c2098f3..c78ebbd3 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 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="3" \
+      release="4" \
       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 08a98f9a..d475ae29 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 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="3" \
+      release="4" \
       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 cfcec59a..c52dee3e 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": "3",
+  "IMAGE_RELEASE_VERSION": "4",
   "POSTGIS_VERSION": "3.4.1",
   "POSTGRES_VERSION": "14.10",
-  "UBI_VERSION": "8.9-1107"
+  "UBI_VERSION": "8.9-1107.1705420509"
 }
diff --git a/UBI/14/.versions.json b/UBI/14/.versions.json
index e47b36fa..6f714a37 100644
--- a/UBI/14/.versions.json
+++ b/UBI/14/.versions.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.9.0",
-  "IMAGE_RELEASE_VERSION": "3",
+  "IMAGE_RELEASE_VERSION": "4",
   "POSTGRES_VERSION": "14.10",
-  "UBI_VERSION": "8.9-1107"
+  "UBI_VERSION": "8.9-1107.1705420509"
 }
diff --git a/UBI/14/Dockerfile b/UBI/14/Dockerfile
index 45034227..c124095f 100644
--- a/UBI/14/Dockerfile
+++ b/UBI/14/Dockerfile
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 
 # 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="3" \
+      release="4" \
       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 3c95383f..27d169af 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 
 # 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="3" \
+      release="4" \
       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 f836afa2..aa08b158 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 
 # 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="3" \
+      release="4" \
       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 b4311add..dc28f07c 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 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="3" \
+      release="4" \
       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 13938cb1..a0f398ba 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 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="3" \
+      release="4" \
       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 9e4c9a2f..ab321892 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": "3",
+  "IMAGE_RELEASE_VERSION": "4",
   "POSTGIS_VERSION": "3.4.1",
   "POSTGRES_VERSION": "15.5",
-  "UBI_VERSION": "8.9-1107"
+  "UBI_VERSION": "8.9-1107.1705420509"
 }
diff --git a/UBI/15/.versions.json b/UBI/15/.versions.json
index 8f86d5f6..50b3371b 100644
--- a/UBI/15/.versions.json
+++ b/UBI/15/.versions.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.9.0",
-  "IMAGE_RELEASE_VERSION": "3",
+  "IMAGE_RELEASE_VERSION": "4",
   "POSTGRES_VERSION": "15.5",
-  "UBI_VERSION": "8.9-1107"
+  "UBI_VERSION": "8.9-1107.1705420509"
 }
diff --git a/UBI/15/Dockerfile b/UBI/15/Dockerfile
index 2a02d07c..1661384e 100644
--- a/UBI/15/Dockerfile
+++ b/UBI/15/Dockerfile
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 
 # 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="3" \
+      release="4" \
       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 4ca10d0c..1b1396d0 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 
 # 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="3" \
+      release="4" \
       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 4740fb1b..71898fc2 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 
 # 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="3" \
+      release="4" \
       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 7fd37583..7fe11866 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 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="3" \
+      release="4" \
       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 2c26939b..27b06836 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 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="3" \
+      release="4" \
       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 4f2d367b..53d05d69 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": "3",
+  "IMAGE_RELEASE_VERSION": "4",
   "POSTGIS_VERSION": "3.4.1",
   "POSTGRES_VERSION": "16.1",
-  "UBI_VERSION": "8.9-1107"
+  "UBI_VERSION": "8.9-1107.1705420509"
 }
diff --git a/UBI/16/.versions.json b/UBI/16/.versions.json
index 68c2bcb4..a87bbd40 100644
--- a/UBI/16/.versions.json
+++ b/UBI/16/.versions.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.9.0",
-  "IMAGE_RELEASE_VERSION": "3",
+  "IMAGE_RELEASE_VERSION": "4",
   "POSTGRES_VERSION": "16.1",
-  "UBI_VERSION": "8.9-1107"
+  "UBI_VERSION": "8.9-1107.1705420509"
 }
diff --git a/UBI/16/Dockerfile b/UBI/16/Dockerfile
index 2a68dc84..a0446694 100644
--- a/UBI/16/Dockerfile
+++ b/UBI/16/Dockerfile
@@ -1,12 +1,12 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 
 # 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="3" \
+      release="4" \
       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 1c7bcb01..0f9b23cc 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 
 # 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="3" \
+      release="4" \
       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 5e38df20..fc0736e4 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 
 # 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="3" \
+      release="4" \
       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 5127acac..30a5e9fa 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 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="3" \
+      release="4" \
       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 6333594c..19f42805 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.9-1107
+FROM quay.io/enterprisedb/edb-ubi:8.9-1107.1705420509
 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="3" \
+      release="4" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."