diff --git a/haproxy/README.md b/haproxy/README.md
index d1c09514e..fee63db83 100644
--- a/haproxy/README.md
+++ b/haproxy/README.md
@@ -28,8 +28,8 @@ WARNING:
 -	[`3.1-dev0-alpine`, `3.1-dev-alpine`, `3.1-dev0-alpine3.20`, `3.1-dev-alpine3.20`](https://github.com/docker-library/haproxy/blob/9a4501c94ca45dc96a871b504d32a997db090707/3.1/alpine/Dockerfile)
 -	[`3.0.1`, `3.0`, `lts`, `latest`, `3.0.1-bookworm`, `3.0-bookworm`, `lts-bookworm`, `bookworm`](https://github.com/docker-library/haproxy/blob/3fa44c97038614c4204f225f5b0fa80bfceb5791/3.0/Dockerfile)
 -	[`3.0.1-alpine`, `3.0-alpine`, `lts-alpine`, `alpine`, `3.0.1-alpine3.20`, `3.0-alpine3.20`, `lts-alpine3.20`, `alpine3.20`](https://github.com/docker-library/haproxy/blob/3fa44c97038614c4204f225f5b0fa80bfceb5791/3.0/alpine/Dockerfile)
--	[`2.9.7`, `2.9`, `2.9.7-bookworm`, `2.9-bookworm`](https://github.com/docker-library/haproxy/blob/8b639f8d7d8d5d3bc42273e509fd7ef0cabdb356/2.9/Dockerfile)
--	[`2.9.7-alpine`, `2.9-alpine`, `2.9.7-alpine3.20`, `2.9-alpine3.20`](https://github.com/docker-library/haproxy/blob/58040965047f8cc37eedbaa4d3180c6313b88440/2.9/alpine/Dockerfile)
+-	[`2.9.8`, `2.9`, `2.9.8-bookworm`, `2.9-bookworm`](https://github.com/docker-library/haproxy/blob/7a42aff80e0da2db2920bc4d338fc634ad4f8e85/2.9/Dockerfile)
+-	[`2.9.8-alpine`, `2.9-alpine`, `2.9.8-alpine3.20`, `2.9-alpine3.20`](https://github.com/docker-library/haproxy/blob/7a42aff80e0da2db2920bc4d338fc634ad4f8e85/2.9/alpine/Dockerfile)
 -	[`2.8.9`, `2.8`, `2.8.9-bookworm`, `2.8-bookworm`](https://github.com/docker-library/haproxy/blob/8b639f8d7d8d5d3bc42273e509fd7ef0cabdb356/2.8/Dockerfile)
 -	[`2.8.9-alpine`, `2.8-alpine`, `2.8.9-alpine3.20`, `2.8-alpine3.20`](https://github.com/docker-library/haproxy/blob/58040965047f8cc37eedbaa4d3180c6313b88440/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)
diff --git a/openjdk/README.md b/openjdk/README.md
index 836133132..aa76b4a64 100644
--- a/openjdk/README.md
+++ b/openjdk/README.md
@@ -42,6 +42,15 @@ The only tags which will continue to receive updates beyond July 2022 will be Ea
 
 ## Simple Tags
 
+-	[`24-ea-1-jdk-oraclelinux9`, `24-ea-1-oraclelinux9`, `24-ea-jdk-oraclelinux9`, `24-ea-oraclelinux9`, `24-jdk-oraclelinux9`, `24-oraclelinux9`, `24-ea-1-jdk-oracle`, `24-ea-1-oracle`, `24-ea-jdk-oracle`, `24-ea-oracle`, `24-jdk-oracle`, `24-oracle`](https://github.com/docker-library/openjdk/blob/e655fc6aa19ab37eb541ed05646b5e79747d39f4/24/jdk/oraclelinux9/Dockerfile)
+-	[`24-ea-1-jdk-oraclelinux8`, `24-ea-1-oraclelinux8`, `24-ea-jdk-oraclelinux8`, `24-ea-oraclelinux8`, `24-jdk-oraclelinux8`, `24-oraclelinux8`](https://github.com/docker-library/openjdk/blob/e655fc6aa19ab37eb541ed05646b5e79747d39f4/24/jdk/oraclelinux8/Dockerfile)
+-	[`24-ea-1-jdk-bookworm`, `24-ea-1-bookworm`, `24-ea-jdk-bookworm`, `24-ea-bookworm`, `24-jdk-bookworm`, `24-bookworm`](https://github.com/docker-library/openjdk/blob/e655fc6aa19ab37eb541ed05646b5e79747d39f4/24/jdk/bookworm/Dockerfile)
+-	[`24-ea-1-jdk-slim-bookworm`, `24-ea-1-slim-bookworm`, `24-ea-jdk-slim-bookworm`, `24-ea-slim-bookworm`, `24-jdk-slim-bookworm`, `24-slim-bookworm`, `24-ea-1-jdk-slim`, `24-ea-1-slim`, `24-ea-jdk-slim`, `24-ea-slim`, `24-jdk-slim`, `24-slim`](https://github.com/docker-library/openjdk/blob/e655fc6aa19ab37eb541ed05646b5e79747d39f4/24/jdk/slim-bookworm/Dockerfile)
+-	[`24-ea-1-jdk-bullseye`, `24-ea-1-bullseye`, `24-ea-jdk-bullseye`, `24-ea-bullseye`, `24-jdk-bullseye`, `24-bullseye`](https://github.com/docker-library/openjdk/blob/e655fc6aa19ab37eb541ed05646b5e79747d39f4/24/jdk/bullseye/Dockerfile)
+-	[`24-ea-1-jdk-slim-bullseye`, `24-ea-1-slim-bullseye`, `24-ea-jdk-slim-bullseye`, `24-ea-slim-bullseye`, `24-jdk-slim-bullseye`, `24-slim-bullseye`](https://github.com/docker-library/openjdk/blob/e655fc6aa19ab37eb541ed05646b5e79747d39f4/24/jdk/slim-bullseye/Dockerfile)
+-	[`24-ea-1-jdk-windowsservercore-ltsc2022`, `24-ea-1-windowsservercore-ltsc2022`, `24-ea-jdk-windowsservercore-ltsc2022`, `24-ea-windowsservercore-ltsc2022`, `24-jdk-windowsservercore-ltsc2022`, `24-windowsservercore-ltsc2022`](https://github.com/docker-library/openjdk/blob/e655fc6aa19ab37eb541ed05646b5e79747d39f4/24/jdk/windows/windowsservercore-ltsc2022/Dockerfile)
+-	[`24-ea-1-jdk-windowsservercore-1809`, `24-ea-1-windowsservercore-1809`, `24-ea-jdk-windowsservercore-1809`, `24-ea-windowsservercore-1809`, `24-jdk-windowsservercore-1809`, `24-windowsservercore-1809`](https://github.com/docker-library/openjdk/blob/e655fc6aa19ab37eb541ed05646b5e79747d39f4/24/jdk/windows/windowsservercore-1809/Dockerfile)
+-	[`24-ea-1-jdk-nanoserver-1809`, `24-ea-1-nanoserver-1809`, `24-ea-jdk-nanoserver-1809`, `24-ea-nanoserver-1809`, `24-jdk-nanoserver-1809`, `24-nanoserver-1809`](https://github.com/docker-library/openjdk/blob/e655fc6aa19ab37eb541ed05646b5e79747d39f4/24/jdk/windows/nanoserver-1809/Dockerfile)
 -	[`23-ea-26-jdk-oraclelinux9`, `23-ea-26-oraclelinux9`, `23-ea-jdk-oraclelinux9`, `23-ea-oraclelinux9`, `23-jdk-oraclelinux9`, `23-oraclelinux9`, `23-ea-26-jdk-oracle`, `23-ea-26-oracle`, `23-ea-jdk-oracle`, `23-ea-oracle`, `23-jdk-oracle`, `23-oracle`](https://github.com/docker-library/openjdk/blob/766b1164e567bb1017eea224f7c910bc9668af92/23/jdk/oraclelinux9/Dockerfile)
 -	[`23-ea-26-jdk-oraclelinux8`, `23-ea-26-oraclelinux8`, `23-ea-jdk-oraclelinux8`, `23-ea-oraclelinux8`, `23-jdk-oraclelinux8`, `23-oraclelinux8`](https://github.com/docker-library/openjdk/blob/766b1164e567bb1017eea224f7c910bc9668af92/23/jdk/oraclelinux8/Dockerfile)
 -	[`23-ea-26-jdk-bookworm`, `23-ea-26-bookworm`, `23-ea-jdk-bookworm`, `23-ea-bookworm`, `23-jdk-bookworm`, `23-bookworm`](https://github.com/docker-library/openjdk/blob/766b1164e567bb1017eea224f7c910bc9668af92/23/jdk/bookworm/Dockerfile)
@@ -54,6 +63,15 @@ The only tags which will continue to receive updates beyond July 2022 will be Ea
 
 ## Shared Tags
 
+-	`24-ea-1-jdk`, `24-ea-1`, `24-ea-jdk`, `24-ea`, `24-jdk`, `24`:
+	-	[`24-ea-1-jdk-oraclelinux9`](https://github.com/docker-library/openjdk/blob/e655fc6aa19ab37eb541ed05646b5e79747d39f4/24/jdk/oraclelinux9/Dockerfile)
+	-	[`24-ea-1-jdk-windowsservercore-ltsc2022`](https://github.com/docker-library/openjdk/blob/e655fc6aa19ab37eb541ed05646b5e79747d39f4/24/jdk/windows/windowsservercore-ltsc2022/Dockerfile)
+	-	[`24-ea-1-jdk-windowsservercore-1809`](https://github.com/docker-library/openjdk/blob/e655fc6aa19ab37eb541ed05646b5e79747d39f4/24/jdk/windows/windowsservercore-1809/Dockerfile)
+-	`24-ea-1-jdk-windowsservercore`, `24-ea-1-windowsservercore`, `24-ea-jdk-windowsservercore`, `24-ea-windowsservercore`, `24-jdk-windowsservercore`, `24-windowsservercore`:
+	-	[`24-ea-1-jdk-windowsservercore-ltsc2022`](https://github.com/docker-library/openjdk/blob/e655fc6aa19ab37eb541ed05646b5e79747d39f4/24/jdk/windows/windowsservercore-ltsc2022/Dockerfile)
+	-	[`24-ea-1-jdk-windowsservercore-1809`](https://github.com/docker-library/openjdk/blob/e655fc6aa19ab37eb541ed05646b5e79747d39f4/24/jdk/windows/windowsservercore-1809/Dockerfile)
+-	`24-ea-1-jdk-nanoserver`, `24-ea-1-nanoserver`, `24-ea-jdk-nanoserver`, `24-ea-nanoserver`, `24-jdk-nanoserver`, `24-nanoserver`:
+	-	[`24-ea-1-jdk-nanoserver-1809`](https://github.com/docker-library/openjdk/blob/e655fc6aa19ab37eb541ed05646b5e79747d39f4/24/jdk/windows/nanoserver-1809/Dockerfile)
 -	`23-ea-26-jdk`, `23-ea-26`, `23-ea-jdk`, `23-ea`, `23-jdk`, `23`:
 	-	[`23-ea-26-jdk-oraclelinux9`](https://github.com/docker-library/openjdk/blob/766b1164e567bb1017eea224f7c910bc9668af92/23/jdk/oraclelinux9/Dockerfile)
 	-	[`23-ea-26-jdk-windowsservercore-ltsc2022`](https://github.com/docker-library/openjdk/blob/766b1164e567bb1017eea224f7c910bc9668af92/23/jdk/windows/windowsservercore-ltsc2022/Dockerfile)