diff --git a/11.0/jdk21/temurin-jammy/Dockerfile b/11.0/jdk21/temurin-jammy/Dockerfile
index 2fb34f4f..c0200fca 100644
--- a/11.0/jdk21/temurin-jammy/Dockerfile
+++ b/11.0/jdk21/temurin-jammy/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 11
-ENV TOMCAT_VERSION 11.0.0-M17
-ENV TOMCAT_SHA512 22e6bef88f3591ca1ef79a0f7a1a22ad327084be6dc887b21d35adeed71755c60b810a3d92584b1d254029c80acc1aa5d63c02fa0c7db76986479f7f08e466c5
+ENV TOMCAT_VERSION 11.0.0-M18
+ENV TOMCAT_SHA512 ede300764e82166316f6bf0561a5469dfdfad118e90a8ea7644b834ce933760574df2fa54347b9bf5206049456d2cc17f06a3e5936838561ced5b022fe2c3053
 
 RUN set -eux; \
 	\
diff --git a/11.0/jre21/temurin-jammy/Dockerfile b/11.0/jre21/temurin-jammy/Dockerfile
index b1ba5a2d..0a18c059 100644
--- a/11.0/jre21/temurin-jammy/Dockerfile
+++ b/11.0/jre21/temurin-jammy/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 11
-ENV TOMCAT_VERSION 11.0.0-M17
-ENV TOMCAT_SHA512 22e6bef88f3591ca1ef79a0f7a1a22ad327084be6dc887b21d35adeed71755c60b810a3d92584b1d254029c80acc1aa5d63c02fa0c7db76986479f7f08e466c5
+ENV TOMCAT_VERSION 11.0.0-M18
+ENV TOMCAT_SHA512 ede300764e82166316f6bf0561a5469dfdfad118e90a8ea7644b834ce933760574df2fa54347b9bf5206049456d2cc17f06a3e5936838561ced5b022fe2c3053
 
-COPY --from=tomcat:11.0.0-M17-jdk21-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:11.0.0-M18-jdk21-temurin-jammy $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/versions.json b/versions.json
index 70e86728..433f3c52 100644
--- a/versions.json
+++ b/versions.json
@@ -12,12 +12,12 @@
     "version": "10.1.19"
   },
   "11.0": {
-    "sha512": "22e6bef88f3591ca1ef79a0f7a1a22ad327084be6dc887b21d35adeed71755c60b810a3d92584b1d254029c80acc1aa5d63c02fa0c7db76986479f7f08e466c5",
+    "sha512": "ede300764e82166316f6bf0561a5469dfdfad118e90a8ea7644b834ce933760574df2fa54347b9bf5206049456d2cc17f06a3e5936838561ced5b022fe2c3053",
     "variants": [
       "jdk21/temurin-jammy",
       "jre21/temurin-jammy"
     ],
-    "version": "11.0.0-M17"
+    "version": "11.0.0-M18"
   },
   "8.5": {
     "sha512": "38f636039d00c66ff8f7347dfedcc1eef85b7ce25cf98dcc9192df07f85d4f6aec447922e0f934c1ab7d099ec484b2060aad4de496d5ca14637ac435cb55b7c0",