diff --git a/.github/workflows/eclipse-temurin-21-jammy.yml b/.github/workflows/eclipse-temurin-21-jammy.yml
new file mode 100644
index 00000000..218e1e4b
--- /dev/null
+++ b/.github/workflows/eclipse-temurin-21-jammy.yml
@@ -0,0 +1,32 @@
+name: eclipse-temurin-21-jammy
+
+on:
+  push:
+    branches:
+    - main
+    paths:
+      - "eclipse-temurin-21-jammy/**"
+      - .github/workflows/eclipse-temurin-21-jammy.yml
+      - .github/workflows/_template.yml
+      - common.sh
+      - tags-for-dir.sh
+      - "tests/**"
+      - "!tests/*.ps*"
+      - "!tests/*.windows"
+  pull_request:
+    paths:
+      - "eclipse-temurin-21-jammy/**"
+      - .github/workflows/eclipse-temurin-21-jammy.yml
+      - .github/workflows/_template.yml
+      - common.sh
+      - tags-for-dir.sh
+      - "tests/**"
+      - "!tests/*.ps*"
+      - "!tests/*.windows"
+
+jobs:
+  build:
+    uses: ./.github/workflows/_template.yml
+    with:
+      directory: eclipse-temurin-21-jammy
+    secrets: inherit
diff --git a/README.md b/README.md
index e028a30d..a7bb3ee6 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,7 @@ See Docker Hub or GitHub Container Registry for an updated list of tags
 * [eclipse-temurin-17-focal](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-17-focal/Dockerfile)
 * [eclipse-temurin-21](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-21/Dockerfile)
 * [eclipse-temurin-21-alpine](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-21-alpine/Dockerfile)
+* [eclipse-temurin-21-jammy](https://github.com/carlossg/docker-maven/blob/main/eclipse-temurin-21-jammy/Dockerfile)
 * [ibm-semeru-11-focal](https://github.com/carlossg/docker-maven/blob/main/ibm-semeru-11-focal/Dockerfile)
 * [ibm-semeru-17-focal](https://github.com/carlossg/docker-maven/blob/main/ibm-semeru-17-focal/Dockerfile)
 * [ibmjava-8](https://github.com/carlossg/docker-maven/blob/main/ibmjava-8/Dockerfile)
diff --git a/eclipse-temurin-21-jammy/Dockerfile b/eclipse-temurin-21-jammy/Dockerfile
new file mode 100644
index 00000000..565dd5b9
--- /dev/null
+++ b/eclipse-temurin-21-jammy/Dockerfile
@@ -0,0 +1,21 @@
+FROM eclipse-temurin:21-jdk-jammy
+
+RUN apt-get update \
+  && apt-get install -y ca-certificates curl git --no-install-recommends \
+  && rm -rf /var/lib/apt/lists/*
+
+# common for all images
+ENV MAVEN_HOME /usr/share/maven
+
+COPY --from=maven:3.9.6-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}
+COPY --from=maven:3.9.6-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY --from=maven:3.9.6-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml
+
+RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
+
+ARG MAVEN_VERSION=3.9.6
+ARG USER_HOME_DIR="/root"
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]