diff --git a/library/maven b/library/maven
index 50a2b10ea55b6..f45f8e0dcdabb 100644
--- a/library/maven
+++ b/library/maven
@@ -118,6 +118,11 @@ Architectures: amd64, arm64v8
 GitCommit: d7319e0caa2961b402073e8054bc63e8dc48d969
 Directory: amazoncorretto-20-debian
 
+Tags: 3.9.4-amazoncorretto-21, 3.9-amazoncorretto-21, 3-amazoncorretto-21
+Architectures: amd64, arm64v8
+GitCommit: 7741c2848c3ea3ad6b4180d94b90d669d419c893
+Directory: amazoncorretto-21
+
 Tags: 3.9.4-amazoncorretto-21-debian, 3.9.4-amazoncorretto-21-debian-bookworm, 3.9-amazoncorretto-21-debian, 3.9-amazoncorretto-21-debian-bookworm, 3-amazoncorretto-21-debian, 3-amazoncorretto-21-debian-bookworm
 Architectures: amd64, arm64v8
 GitCommit: 61b5d8d7e9e5706522ff154315db185816d35891
@@ -147,3 +152,8 @@ Tags: 3.9.4-sapmachine-17, 3.9.4-sapmachine, 3.9-sapmachine-17, 3.9-sapmachine,
 Architectures: amd64, arm64v8, ppc64le
 GitCommit: d7319e0caa2961b402073e8054bc63e8dc48d969
 Directory: sapmachine-17
+
+Tags: 3.9.4-sapmachine-21, 3.9-sapmachine-21, 3-sapmachine-21
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: c6ea9b77dab964547324ce49b61ea542fc55f5b5
+Directory: sapmachine-21