diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile
index f5c42d0bb..952e6932e 100644
--- a/Dockerfiles/build-base/centos/Dockerfile
+++ b/Dockerfiles/build-base/centos/Dockerfile
@@ -36,7 +36,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             openssl-devel \
             openldap-devel \
             make \
-            mysql-devel \
+            mysql8.4-devel \
             net-snmp-devel \
             OpenIPMI-devel \
             openldap-devel \
diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile
index 29397e6df..07cb07186 100644
--- a/Dockerfiles/proxy-mysql/centos/Dockerfile
+++ b/Dockerfiles/proxy-mysql/centos/Dockerfile
@@ -59,8 +59,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             fping \
             iputils \
             libxml2 \
-            mysql \
-            mysql-libs \
+            mysql8.4 \
+            mysql8.4-libs \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \
diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile
index 5c122e5cd..10e66e234 100644
--- a/Dockerfiles/server-mysql/centos/Dockerfile
+++ b/Dockerfiles/server-mysql/centos/Dockerfile
@@ -62,8 +62,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             libpsl \
             libbrotli \
             libxml2 \
-            mysql \
-            mysql-libs \
+            mysql8.4 \
+            mysql8.4-libs \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \
diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile
index 234c70a7f..026b0ca12 100644
--- a/Dockerfiles/web-apache-mysql/centos/Dockerfile
+++ b/Dockerfiles/web-apache-mysql/centos/Dockerfile
@@ -39,7 +39,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     INSTALL_PKGS="bash \
             curl-minimal \
             httpd \
-            mysql \
+            mysql8.4 \
             mod_ssl \
             php \
             php-curl \
diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile
index 9552aea00..02af022a5 100644
--- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile
+++ b/Dockerfiles/web-nginx-mysql/centos/Dockerfile
@@ -38,7 +38,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     set -eux && \
     INSTALL_PKGS="bash \
             curl-minimal \
-            mysql \
+            mysql8.4 \
             nginx \
             php-bcmath \
             php-curl \
diff --git a/build.json b/build.json
index 0bb9985c7..bae4099ec 100644
--- a/build.json
+++ b/build.json
@@ -29,8 +29,7 @@
     ]
   },
   "os-windows": {
-    "windows-2022": "ltsc2022",
-    "windows-2025": "ltsc2025"
+    "windows-2022": "ltsc2022"
   },
   "components": {
     "agent": { "base": "build-mysql", "rhel": true },