diff --git a/README.md b/README.md
index 763428cfe04..3c226e5ddca 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ To help you get started, try the following links:
 Getting Started
 - You need JDK17+ to run Apache ActiveMQ
 - After having extracted ActiveMQ binary distribution, you can start ActiveMQ with `./bin/activemq console` (foreground) or `./bin/activemq start`
-- Docker images are also available on Docker Hub (https://hub.docker.com/r/apache/activemq-classic)
+- Docker images are also available on Docker Hub (https://hub.docker.com/r/apache/activemq)
 
 Building
 - You can build (fast) using Apache Maven: `mvn clean install -DskipTests`
diff --git a/assembly/src/docker/Dockerfile b/assembly/src/docker/Dockerfile
index 26d12066995..b4c312e5d17 100644
--- a/assembly/src/docker/Dockerfile
+++ b/assembly/src/docker/Dockerfile
@@ -16,7 +16,7 @@
 # limitations under the License.
 ################################################################################
 
-ARG java_version=17
+ARG java_version=21
 FROM eclipse-temurin:${java_version}-jre
 
 # ActiveMQ environment variables
diff --git a/assembly/src/docker/README.md b/assembly/src/docker/README.md
index ae6edf645f3..9df574dd3d4 100644
--- a/assembly/src/docker/README.md
+++ b/assembly/src/docker/README.md
@@ -32,7 +32,7 @@ On macOS, an easy way to install `buildx` is to install [Docker Desktop Edge](ht
 
 ## Build
 
-Images are based on the Docker official [Eclipse Temurin 17 JRE](https://hub.docker.com/_/eclipse-temurin/tags?page=1&name=17-jre) image. If you want to
+Images are based on the Docker official [Eclipse Temurin 21 JRE](https://hub.docker.com/_/eclipse-temurin/tags?page=1&name=21-jre) image. If you want to
 build the ActiveMQ image you have the following choices:
 
 1. Create the docker image from a local distribution package
@@ -50,7 +50,7 @@ Usage:
 
   If the --image-name flag is not used the built image name will be 'activemq'.
   Check the supported build platforms; you can verify with this command: docker buildx ls
-  The supported platforms (OS/Arch) depend on the build's base image, in this case [eclipse-temurin:17-jre](https://hub.docker.com/_/eclipse-temurin).
+  The supported platforms (OS/Arch) depend on the build's base image, in this case [eclipse-temurin:21-jre](https://hub.docker.com/_/eclipse-temurin).
 ```
 
 To create the docker image from local distribution) you can execute the command
@@ -163,4 +163,4 @@ Edit the `docker-compose.yml` file to edit port settings.
 | `ACTIVEMQ_JMX_USER` | Username to access the JMX MBean server of the broker. If set, ActiveMQ accepts remote JMX connection, else, only local connection are allowed. |
 | `ACTIVEMQ_JMX_PASSWORD` | Password to access the JMX MBean server of the broker. It should be used with `ACTIVEMQ_JMX_USER`/  |
 | `ACTIVEMQ_WEB_USER` | Username to access the ActiveMQ WebConsole. |
-| `ACTIVEMQ_WEB_PASSWORD` | Password to access the ActiveMQ WebConsole. |
\ No newline at end of file
+| `ACTIVEMQ_WEB_PASSWORD` | Password to access the ActiveMQ WebConsole. |