diff --git a/aerospike/README.md b/aerospike/README.md
index 1695b829a720..b83f5f79eb5a 100644
--- a/aerospike/README.md
+++ b/aerospike/README.md
@@ -24,9 +24,9 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`ee-7.1.0.7`, `ee-7.1.0.7_1`](https://github.com/aerospike/aerospike-server.docker/blob/9b0b542c4e0e0354a32f338ae2c6fbad19af2924/enterprise/ubuntu22.04/Dockerfile)
+-	[`ee-7.2.0.1`, `ee-7.2.0.1_1`](https://github.com/aerospike/aerospike-server.docker/blob/5399d18794233ac6f8cdd8bfa6825b53bb4c1935/enterprise/ubuntu24.04/Dockerfile)
 
--	[`ce-7.1.0.7`, `ce-7.1.0.7_1`](https://github.com/aerospike/aerospike-server.docker/blob/9b0b542c4e0e0354a32f338ae2c6fbad19af2924/community/ubuntu22.04/Dockerfile)
+-	[`ce-7.2.0.1`, `ce-7.2.0.1_1`](https://github.com/aerospike/aerospike-server.docker/blob/5399d18794233ac6f8cdd8bfa6825b53bb4c1935/community/ubuntu24.04/Dockerfile)
 
 # Quick reference (cont.)
 
@@ -218,7 +218,7 @@ For more, see [How do I get a 2 nodes Aerospike cluster running quickly in Docke
 
 ## Image Versions
 
-These images are based on [ubuntu:22.04](https://hub.docker.com/_/ubuntu).
+These images are based on [ubuntu:24.04](https://hub.docker.com/_/ubuntu).
 
 ### ee-[version]
 
diff --git a/spark/README.md b/spark/README.md
index 8d8b02915503..f58ea04e656f 100644
--- a/spark/README.md
+++ b/spark/README.md
@@ -24,13 +24,21 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`4.0.0-preview1-scala2.13-java17-python3-ubuntu`, `4.0.0-preview1-python3`, `4.0.0-preview1`](https://github.com/apache/spark-docker/blob/b9f1f8e8ebed1959c2be3864a114b52f67519092/4.0.0-preview1/scala2.13-java17-python3-ubuntu/Dockerfile)
+-	[`4.0.0-preview2-scala2.13-java21-python3-ubuntu`, `4.0.0-preview2-java21-python3`, `4.0.0-preview2-java21`](https://github.com/apache/spark-docker/blob/059a2817e53ac7c0c408196f9eb91397a99ec84e/4.0.0-preview2/scala2.13-java21-python3-ubuntu/Dockerfile)
 
--	[`4.0.0-preview1-scala2.13-java17-r-ubuntu`, `4.0.0-preview1-r`](https://github.com/apache/spark-docker/blob/b9f1f8e8ebed1959c2be3864a114b52f67519092/4.0.0-preview1/scala2.13-java17-r-ubuntu/Dockerfile)
+-	[`4.0.0-preview2-scala2.13-java21-r-ubuntu`, `4.0.0-preview2-java21-r`](https://github.com/apache/spark-docker/blob/059a2817e53ac7c0c408196f9eb91397a99ec84e/4.0.0-preview2/scala2.13-java21-r-ubuntu/Dockerfile)
 
--	[`4.0.0-preview1-scala2.13-java17-ubuntu`, `4.0.0-preview1-scala`](https://github.com/apache/spark-docker/blob/b9f1f8e8ebed1959c2be3864a114b52f67519092/4.0.0-preview1/scala2.13-java17-ubuntu/Dockerfile)
+-	[`4.0.0-preview2-scala2.13-java21-ubuntu`, `4.0.0-preview2-java21-scala`](https://github.com/apache/spark-docker/blob/059a2817e53ac7c0c408196f9eb91397a99ec84e/4.0.0-preview2/scala2.13-java21-ubuntu/Dockerfile)
 
--	[`4.0.0-preview1-scala2.13-java17-python3-r-ubuntu`](https://github.com/apache/spark-docker/blob/b9f1f8e8ebed1959c2be3864a114b52f67519092/4.0.0-preview1/scala2.13-java17-python3-r-ubuntu/Dockerfile)
+-	[`4.0.0-preview2-scala2.13-java21-python3-r-ubuntu`](https://github.com/apache/spark-docker/blob/059a2817e53ac7c0c408196f9eb91397a99ec84e/4.0.0-preview2/scala2.13-java21-python3-r-ubuntu/Dockerfile)
+
+-	[`4.0.0-preview2-scala2.13-java17-python3-ubuntu`, `4.0.0-preview2-python3`, `4.0.0-preview2`](https://github.com/apache/spark-docker/blob/059a2817e53ac7c0c408196f9eb91397a99ec84e/4.0.0-preview2/scala2.13-java17-python3-ubuntu/Dockerfile)
+
+-	[`4.0.0-preview2-scala2.13-java17-r-ubuntu`, `4.0.0-preview2-r`](https://github.com/apache/spark-docker/blob/059a2817e53ac7c0c408196f9eb91397a99ec84e/4.0.0-preview2/scala2.13-java17-r-ubuntu/Dockerfile)
+
+-	[`4.0.0-preview2-scala2.13-java17-ubuntu`, `4.0.0-preview2-scala`](https://github.com/apache/spark-docker/blob/059a2817e53ac7c0c408196f9eb91397a99ec84e/4.0.0-preview2/scala2.13-java17-ubuntu/Dockerfile)
+
+-	[`4.0.0-preview2-scala2.13-java17-python3-r-ubuntu`](https://github.com/apache/spark-docker/blob/059a2817e53ac7c0c408196f9eb91397a99ec84e/4.0.0-preview2/scala2.13-java17-python3-r-ubuntu/Dockerfile)
 
 -	[`3.5.2-scala2.12-java17-python3-ubuntu`, `3.5.2-java17-python3`, `3.5.2-java17`, `python3-java17`](https://github.com/apache/spark-docker/blob/b9f1f8e8ebed1959c2be3864a114b52f67519092/3.5.2/scala2.12-java17-python3-ubuntu/Dockerfile)