diff --git a/haproxy/README.md b/haproxy/README.md
index 08f0809f8..cb6773f7a 100644
--- a/haproxy/README.md
+++ b/haproxy/README.md
@@ -32,10 +32,10 @@ WARNING:
 -	[`2.9.9-alpine`, `2.9-alpine`, `2.9.9-alpine3.20`, `2.9-alpine3.20`](https://github.com/docker-library/haproxy/blob/e85e5b3e506be4b05de5062f27cbbd3fde03f923/2.9/alpine/Dockerfile)
 -	[`2.8.10`, `2.8`, `2.8.10-bookworm`, `2.8-bookworm`](https://github.com/docker-library/haproxy/blob/01b3b0d48c75a815148d46ae86b409507e232e1c/2.8/Dockerfile)
 -	[`2.8.10-alpine`, `2.8-alpine`, `2.8.10-alpine3.20`, `2.8-alpine3.20`](https://github.com/docker-library/haproxy/blob/01b3b0d48c75a815148d46ae86b409507e232e1c/2.8/alpine/Dockerfile)
--	[`2.6.17`, `2.6`, `2.6.17-bookworm`, `2.6-bookworm`](https://github.com/docker-library/haproxy/blob/8b639f8d7d8d5d3bc42273e509fd7ef0cabdb356/2.6/Dockerfile)
--	[`2.6.17-alpine`, `2.6-alpine`, `2.6.17-alpine3.20`, `2.6-alpine3.20`](https://github.com/docker-library/haproxy/blob/58040965047f8cc37eedbaa4d3180c6313b88440/2.6/alpine/Dockerfile)
--	[`2.4.26`, `2.4`, `2.4.26-bookworm`, `2.4-bookworm`](https://github.com/docker-library/haproxy/blob/8b639f8d7d8d5d3bc42273e509fd7ef0cabdb356/2.4/Dockerfile)
--	[`2.4.26-alpine`, `2.4-alpine`, `2.4.26-alpine3.20`, `2.4-alpine3.20`](https://github.com/docker-library/haproxy/blob/58040965047f8cc37eedbaa4d3180c6313b88440/2.4/alpine/Dockerfile)
+-	[`2.6.18`, `2.6`, `2.6.18-bookworm`, `2.6-bookworm`](https://github.com/docker-library/haproxy/blob/af88bbc9186ea2ea09fa59dc77ae9437cad687b4/2.6/Dockerfile)
+-	[`2.6.18-alpine`, `2.6-alpine`, `2.6.18-alpine3.20`, `2.6-alpine3.20`](https://github.com/docker-library/haproxy/blob/af88bbc9186ea2ea09fa59dc77ae9437cad687b4/2.6/alpine/Dockerfile)
+-	[`2.4.27`, `2.4`, `2.4.27-bookworm`, `2.4-bookworm`](https://github.com/docker-library/haproxy/blob/c72a79f8fe0a0db91b36645220409c08d11cc0a6/2.4/Dockerfile)
+-	[`2.4.27-alpine`, `2.4-alpine`, `2.4.27-alpine3.20`, `2.4-alpine3.20`](https://github.com/docker-library/haproxy/blob/c72a79f8fe0a0db91b36645220409c08d11cc0a6/2.4/alpine/Dockerfile)
 -	[`2.2.33`, `2.2`, `2.2.33-bullseye`, `2.2-bullseye`](https://github.com/docker-library/haproxy/blob/8b639f8d7d8d5d3bc42273e509fd7ef0cabdb356/2.2/Dockerfile)
 
 # Quick reference (cont.)
diff --git a/tomcat/README.md b/tomcat/README.md
index c2fc9e012..0d8e759c7 100644
--- a/tomcat/README.md
+++ b/tomcat/README.md
@@ -24,8 +24,8 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`11.0.0-M20-jdk21-temurin-jammy`, `11.0.0-jdk21-temurin-jammy`, `11.0-jdk21-temurin-jammy`, `11.0.0-M20-jdk21-temurin`, `11.0.0-jdk21-temurin`, `11.0-jdk21-temurin`, `11.0.0-M20-jdk21`, `11.0.0-jdk21`, `11.0-jdk21`, `11.0.0-M20`, `11.0.0`, `11.0`](https://github.com/docker-library/tomcat/blob/3ffa12959996cd955614a78ca73c68313245d57f/11.0/jdk21/temurin-jammy/Dockerfile)
--	[`11.0.0-M20-jre21-temurin-jammy`, `11.0.0-jre21-temurin-jammy`, `11.0-jre21-temurin-jammy`, `11.0.0-M20-jre21-temurin`, `11.0.0-jre21-temurin`, `11.0-jre21-temurin`, `11.0.0-M20-jre21`, `11.0.0-jre21`, `11.0-jre21`](https://github.com/docker-library/tomcat/blob/3ffa12959996cd955614a78ca73c68313245d57f/11.0/jre21/temurin-jammy/Dockerfile)
+-	[`11.0.0-M21-jdk21-temurin-jammy`, `11.0.0-jdk21-temurin-jammy`, `11.0-jdk21-temurin-jammy`, `11.0.0-M21-jdk21-temurin`, `11.0.0-jdk21-temurin`, `11.0-jdk21-temurin`, `11.0.0-M21-jdk21`, `11.0.0-jdk21`, `11.0-jdk21`, `11.0.0-M21`, `11.0.0`, `11.0`](https://github.com/docker-library/tomcat/blob/8e7b733a76bf1e79c0a58d2a64ed7e29f5caf17e/11.0/jdk21/temurin-jammy/Dockerfile)
+-	[`11.0.0-M21-jre21-temurin-jammy`, `11.0.0-jre21-temurin-jammy`, `11.0-jre21-temurin-jammy`, `11.0.0-M21-jre21-temurin`, `11.0.0-jre21-temurin`, `11.0-jre21-temurin`, `11.0.0-M21-jre21`, `11.0.0-jre21`, `11.0-jre21`](https://github.com/docker-library/tomcat/blob/8e7b733a76bf1e79c0a58d2a64ed7e29f5caf17e/11.0/jre21/temurin-jammy/Dockerfile)
 -	[`10.1.24-jdk21-temurin-jammy`, `10.1-jdk21-temurin-jammy`, `10-jdk21-temurin-jammy`, `jdk21-temurin-jammy`, `10.1.24-jdk21-temurin`, `10.1-jdk21-temurin`, `10-jdk21-temurin`, `jdk21-temurin`, `10.1.24-jdk21`, `10.1-jdk21`, `10-jdk21`, `jdk21`, `10.1.24`, `10.1`, `10`, `latest`](https://github.com/docker-library/tomcat/blob/065b183fdf5b4ab6f4450e73db6b52d4237f212a/10.1/jdk21/temurin-jammy/Dockerfile)
 -	[`10.1.24-jre21-temurin-jammy`, `10.1-jre21-temurin-jammy`, `10-jre21-temurin-jammy`, `jre21-temurin-jammy`, `10.1.24-jre21-temurin`, `10.1-jre21-temurin`, `10-jre21-temurin`, `jre21-temurin`, `10.1.24-jre21`, `10.1-jre21`, `10-jre21`, `jre21`](https://github.com/docker-library/tomcat/blob/065b183fdf5b4ab6f4450e73db6b52d4237f212a/10.1/jre21/temurin-jammy/Dockerfile)
 -	[`10.1.24-jdk17-temurin-jammy`, `10.1-jdk17-temurin-jammy`, `10-jdk17-temurin-jammy`, `jdk17-temurin-jammy`, `10.1.24-jdk17-temurin`, `10.1-jdk17-temurin`, `10-jdk17-temurin`, `jdk17-temurin`, `10.1.24-jdk17`, `10.1-jdk17`, `10-jdk17`, `jdk17`](https://github.com/docker-library/tomcat/blob/065b183fdf5b4ab6f4450e73db6b52d4237f212a/10.1/jdk17/temurin-jammy/Dockerfile)