diff --git a/UBI/12/.versions.json b/UBI/12/.versions-ubi8.json
similarity index 76%
rename from UBI/12/.versions.json
rename to UBI/12/.versions-ubi8.json
index a8567f74..4d19338a 100644
--- a/UBI/12/.versions.json
+++ b/UBI/12/.versions-ubi8.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.10.0",
-  "IMAGE_RELEASE_VERSION": "5",
+  "IMAGE_RELEASE_VERSION": "1",
   "POSTGRES_VERSION": "12.17",
   "UBI_VERSION": "8.9-1107.1705420509"
 }
diff --git a/UBI/12/.versions-ubi9.json b/UBI/12/.versions-ubi9.json
new file mode 100644
index 00000000..9cdb9cc2
--- /dev/null
+++ b/UBI/12/.versions-ubi9.json
@@ -0,0 +1,6 @@
+{
+  "BARMAN_VERSION": "3.10.0",
+  "IMAGE_RELEASE_VERSION": "1",
+  "POSTGRES_VERSION": "12.17",
+  "UBI_VERSION": "9.3-1476"
+}
diff --git a/UBI/13/.versions.json b/UBI/13/.versions-ubi8.json
similarity index 76%
rename from UBI/13/.versions.json
rename to UBI/13/.versions-ubi8.json
index b297cdbb..344a4c69 100644
--- a/UBI/13/.versions.json
+++ b/UBI/13/.versions-ubi8.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.10.0",
-  "IMAGE_RELEASE_VERSION": "5",
+  "IMAGE_RELEASE_VERSION": "1",
   "POSTGRES_VERSION": "13.13",
   "UBI_VERSION": "8.9-1107.1705420509"
 }
diff --git a/UBI/13/.versions-ubi9.json b/UBI/13/.versions-ubi9.json
new file mode 100644
index 00000000..0663a7d5
--- /dev/null
+++ b/UBI/13/.versions-ubi9.json
@@ -0,0 +1,6 @@
+{
+  "BARMAN_VERSION": "3.10.0",
+  "IMAGE_RELEASE_VERSION": "1",
+  "POSTGRES_VERSION": "13.13",
+  "UBI_VERSION": "9.3-1476"
+}
diff --git a/UBI/14/.versions.json b/UBI/14/.versions-ubi8.json
similarity index 76%
rename from UBI/14/.versions.json
rename to UBI/14/.versions-ubi8.json
index f210361a..97d1c236 100644
--- a/UBI/14/.versions.json
+++ b/UBI/14/.versions-ubi8.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.10.0",
-  "IMAGE_RELEASE_VERSION": "5",
+  "IMAGE_RELEASE_VERSION": "1",
   "POSTGRES_VERSION": "14.10",
   "UBI_VERSION": "8.9-1107.1705420509"
 }
diff --git a/UBI/14/.versions-ubi9.json b/UBI/14/.versions-ubi9.json
new file mode 100644
index 00000000..8c1c1a9f
--- /dev/null
+++ b/UBI/14/.versions-ubi9.json
@@ -0,0 +1,6 @@
+{
+  "BARMAN_VERSION": "3.10.0",
+  "IMAGE_RELEASE_VERSION": "1",
+  "POSTGRES_VERSION": "14.10",
+  "UBI_VERSION": "9.3-1476"
+}
diff --git a/UBI/15/.versions.json b/UBI/15/.versions-ubi8.json
similarity index 76%
rename from UBI/15/.versions.json
rename to UBI/15/.versions-ubi8.json
index 650d93a1..9a6ab0b1 100644
--- a/UBI/15/.versions.json
+++ b/UBI/15/.versions-ubi8.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.10.0",
-  "IMAGE_RELEASE_VERSION": "5",
+  "IMAGE_RELEASE_VERSION": "1",
   "POSTGRES_VERSION": "15.5",
   "UBI_VERSION": "8.9-1107.1705420509"
 }
diff --git a/UBI/15/.versions-ubi9.json b/UBI/15/.versions-ubi9.json
new file mode 100644
index 00000000..ddfa901e
--- /dev/null
+++ b/UBI/15/.versions-ubi9.json
@@ -0,0 +1,6 @@
+{
+  "BARMAN_VERSION": "3.10.0",
+  "IMAGE_RELEASE_VERSION": "1",
+  "POSTGRES_VERSION": "15.5",
+  "UBI_VERSION": "9.3-1476"
+}
diff --git a/UBI/16/.versions.json b/UBI/16/.versions-ubi8.json
similarity index 76%
rename from UBI/16/.versions.json
rename to UBI/16/.versions-ubi8.json
index b04da71e..855f7c1a 100644
--- a/UBI/16/.versions.json
+++ b/UBI/16/.versions-ubi8.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.10.0",
-  "IMAGE_RELEASE_VERSION": "5",
+  "IMAGE_RELEASE_VERSION": "1",
   "POSTGRES_VERSION": "16.1",
   "UBI_VERSION": "8.9-1107.1705420509"
 }
diff --git a/UBI/16/.versions-ubi9.json b/UBI/16/.versions-ubi9.json
new file mode 100644
index 00000000..9fa42939
--- /dev/null
+++ b/UBI/16/.versions-ubi9.json
@@ -0,0 +1,6 @@
+{
+  "BARMAN_VERSION": "3.10.0",
+  "IMAGE_RELEASE_VERSION": "1",
+  "POSTGRES_VERSION": "16.1",
+  "UBI_VERSION": "9.3-1476"
+}