diff --git a/11.8-ubi/Dockerfile b/11.8-ubi/Dockerfile
index a299804..0e25576 100644
--- a/11.8-ubi/Dockerfile
+++ b/11.8-ubi/Dockerfile
@@ -36,7 +36,7 @@ COPY MariaDB.repo /etc/yum.repos.d/
 # https://access.redhat.com/documentation/en-us/red_hat_software_certification/2024/html/red_hat_openshift_software_certification_policy_guide/assembly-requirements-for-container-images_openshift-sw-cert-policy-introduction#con-image-metadata-requirements_openshift-sw-cert-policy-container-images
 LABEL name="MariaDB Server" \
 	vendor="MariaDB Community" \
-	version="11.8.1" \
+	version="11.8.2" \
 	release="Refer to Annotations org.opencontainers.image.{revision,source}" \
 	summary="MariaDB Database" \
 	description="MariaDB Database for relational SQL"
@@ -50,11 +50,11 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
       org.opencontainers.image.licenses="GPL-2.0" \
       org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
       org.opencontainers.image.vendor="MariaDB Community" \
-      org.opencontainers.image.version="11.8.1" \
+      org.opencontainers.image.version="11.8.2" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=11.8.1
+ARG MARIADB_VERSION=11.8.2
 ENV MARIADB_VERSION=$MARIADB_VERSION
 # release-status:RC
 # release-support-type:Long Term Support
diff --git a/11.8-ubi/docker-entrypoint.sh b/11.8-ubi/docker-entrypoint.sh
index 6538fbb..061c077 100755
--- a/11.8-ubi/docker-entrypoint.sh
+++ b/11.8-ubi/docker-entrypoint.sh
@@ -225,7 +225,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-	echo -n "11.8.1-MariaDB"
+	echo -n "11.8.2-MariaDB"
 }
 
 # initializes the database directory
diff --git a/11.8/Dockerfile b/11.8/Dockerfile
index 479e814..232ddf3 100644
--- a/11.8/Dockerfile
+++ b/11.8/Dockerfile
@@ -75,18 +75,18 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
       org.opencontainers.image.licenses="GPL-2.0" \
       org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
       org.opencontainers.image.vendor="MariaDB Community" \
-      org.opencontainers.image.version="11.8.1" \
+      org.opencontainers.image.version="11.8.2" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:11.8.1+maria~ubu2404
+ARG MARIADB_VERSION=1:11.8.2+maria~ubu2404
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:RC
 # release-support-type:Long Term Support
 # (https://downloads.mariadb.org/rest-api/mariadb/)
 
 # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
-ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.8.1/repo/ubuntu/ noble main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.8.2/repo/ubuntu/ noble main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
diff --git a/11.8/docker-entrypoint.sh b/11.8/docker-entrypoint.sh
index 6538fbb..061c077 100755
--- a/11.8/docker-entrypoint.sh
+++ b/11.8/docker-entrypoint.sh
@@ -225,7 +225,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-	echo -n "11.8.1-MariaDB"
+	echo -n "11.8.2-MariaDB"
 }
 
 # initializes the database directory
diff --git a/11.7-ubi/Dockerfile b/12.0-ubi/Dockerfile
similarity index 97%
rename from 11.7-ubi/Dockerfile
rename to 12.0-ubi/Dockerfile
index 5f0bee2..52d345f 100644
--- a/11.7-ubi/Dockerfile
+++ b/12.0-ubi/Dockerfile
@@ -36,7 +36,7 @@ COPY MariaDB.repo /etc/yum.repos.d/
 # https://access.redhat.com/documentation/en-us/red_hat_software_certification/2024/html/red_hat_openshift_software_certification_policy_guide/assembly-requirements-for-container-images_openshift-sw-cert-policy-introduction#con-image-metadata-requirements_openshift-sw-cert-policy-container-images
 LABEL name="MariaDB Server" \
 	vendor="MariaDB Community" \
-	version="11.7.2" \
+	version="12.0.1" \
 	release="Refer to Annotations org.opencontainers.image.{revision,source}" \
 	summary="MariaDB Database" \
 	description="MariaDB Database for relational SQL"
@@ -50,14 +50,14 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
       org.opencontainers.image.licenses="GPL-2.0" \
       org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
       org.opencontainers.image.vendor="MariaDB Community" \
-      org.opencontainers.image.version="11.7.2" \
+      org.opencontainers.image.version="12.0.1" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=11.7.2
+ARG MARIADB_VERSION=12.0.1
 ENV MARIADB_VERSION=$MARIADB_VERSION
-# release-status:Stable
-# release-support-type:Short Term Support
+# release-status:RC
+# release-support-type:Rolling
 # (https://downloads.mariadb.org/rest-api/mariadb/)
 
 # missing pwgen(epel), jemalloc(epel) (as entrypoint/user extensions)
diff --git a/11.7-ubi/MariaDB.repo b/12.0-ubi/MariaDB.repo
similarity index 53%
rename from 11.7-ubi/MariaDB.repo
rename to 12.0-ubi/MariaDB.repo
index fe521d5..2d4563c 100644
--- a/11.7-ubi/MariaDB.repo
+++ b/12.0-ubi/MariaDB.repo
@@ -1,7 +1,7 @@
 [mariadb]
 name = MariaDB
-#baseurl = https://rpm.mariadb.org/11.7/rhel/$releasever/$basearch
-baseurl = https://archive.mariadb.org/mariadb-11.7/yum/rhel/$releasever/$basearch
+#baseurl = https://rpm.mariadb.org/12.0/rhel/$releasever/$basearch
+baseurl = https://archive.mariadb.org/mariadb-12.0/yum/rhel/$releasever/$basearch
 #microdnf cannot read to the second key here.
 #gpgkey=https://archive.mariadb.org/PublicKey
 gpgcheck=1
diff --git a/11.7/docker-entrypoint.sh b/12.0-ubi/docker-entrypoint.sh
similarity index 99%
rename from 11.7/docker-entrypoint.sh
rename to 12.0-ubi/docker-entrypoint.sh
index 8c83522..2be166f 100755
--- a/11.7/docker-entrypoint.sh
+++ b/12.0-ubi/docker-entrypoint.sh
@@ -225,7 +225,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-	echo -n "11.7.2-MariaDB"
+	echo -n "12.0.1-MariaDB"
 }
 
 # initializes the database directory
diff --git a/11.7-ubi/docker.cnf b/12.0-ubi/docker.cnf
similarity index 100%
rename from 11.7-ubi/docker.cnf
rename to 12.0-ubi/docker.cnf
diff --git a/11.7-ubi/healthcheck.sh b/12.0-ubi/healthcheck.sh
similarity index 100%
rename from 11.7-ubi/healthcheck.sh
rename to 12.0-ubi/healthcheck.sh
diff --git a/11.7/Dockerfile b/12.0/Dockerfile
similarity index 96%
rename from 11.7/Dockerfile
rename to 12.0/Dockerfile
index 78bc8a7..c9fc0fe 100644
--- a/11.7/Dockerfile
+++ b/12.0/Dockerfile
@@ -75,18 +75,18 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
       org.opencontainers.image.licenses="GPL-2.0" \
       org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
       org.opencontainers.image.vendor="MariaDB Community" \
-      org.opencontainers.image.version="11.7.2" \
+      org.opencontainers.image.version="12.0.1" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:11.7.2+maria~ubu2404
+ARG MARIADB_VERSION=1:12.0.1+maria~ubu2404
 ENV MARIADB_VERSION $MARIADB_VERSION
-# release-status:Stable
-# release-support-type:Short Term Support
+# release-status:RC
+# release-support-type:Rolling
 # (https://downloads.mariadb.org/rest-api/mariadb/)
 
 # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
-ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.7.2/repo/ubuntu/ noble main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-12.0.1/repo/ubuntu/ noble main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
diff --git a/11.7-ubi/docker-entrypoint.sh b/12.0/docker-entrypoint.sh
similarity index 99%
rename from 11.7-ubi/docker-entrypoint.sh
rename to 12.0/docker-entrypoint.sh
index 8c83522..2be166f 100755
--- a/11.7-ubi/docker-entrypoint.sh
+++ b/12.0/docker-entrypoint.sh
@@ -225,7 +225,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-	echo -n "11.7.2-MariaDB"
+	echo -n "12.0.1-MariaDB"
 }
 
 # initializes the database directory
diff --git a/11.7/healthcheck.sh b/12.0/healthcheck.sh
similarity index 100%
rename from 11.7/healthcheck.sh
rename to 12.0/healthcheck.sh
diff --git a/versions.json b/versions.json
index fe81393..689ca8c 100644
--- a/versions.json
+++ b/versions.json
@@ -1,8 +1,8 @@
 {
   "11.8": {
     "milestone": "11.8",
-    "version": "11.8.1",
-    "fullVersion": "1:11.8.1+maria~ubu2404",
+    "version": "11.8.2",
+    "fullVersion": "1:11.8.2+maria~ubu2404",
     "releaseStatus": "RC",
     "supportType": "Long Term Support",
     "base": "ubuntu:noble",
@@ -15,8 +15,8 @@
   },
   "11.8-ubi": {
     "milestone": "11.8",
-    "version": "11.8.1",
-    "fullVersion": "11.8.1",
+    "version": "11.8.2",
+    "fullVersion": "11.8.2",
     "releaseStatus": "RC",
     "supportType": "Long Term Support",
     "base": "ubi9",
@@ -152,5 +152,33 @@
       "ppc64le",
       "s390x"
     ]
+  },
+  "12.0": {
+    "milestone": "12.0",
+    "version": "12.0.1",
+    "fullVersion": "1:12.0.1+maria~ubu2404",
+    "releaseStatus": "RC",
+    "supportType": "Rolling",
+    "base": "ubuntu:noble",
+    "arches": [
+      "amd64",
+      "arm64v8",
+      "ppc64le",
+      "s390x"
+    ]
+  },
+  "12.0-ubi": {
+    "milestone": "12.0",
+    "version": "12.0.1",
+    "fullVersion": "12.0.1",
+    "releaseStatus": "RC",
+    "supportType": "Rolling",
+    "base": "ubi9",
+    "arches": [
+      "amd64",
+      "arm64v8",
+      "ppc64le",
+      "s390x"
+    ]
   }
 }