diff --git a/docs/index.md b/docs/index.md
index 884e02476..06c9beb6d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -306,9 +306,6 @@ Use the following [dependency matrix](https://github.com/eclipse-aspectj/aspectj
 | `11-17`     | `1.9.20.1`      |
 | `21`        | `1.9.21`        |
 
-_Note: 1.9.21 is not yet available and Java 21 not yet officially supported by aspectj, but you can already use the `1.9.21.M1`_
-
-
 ## Environment variables
 
 !!! info
diff --git a/powertools-e2e-tests/handlers/pom.xml b/powertools-e2e-tests/handlers/pom.xml
index a9096477b..799ed465e 100644
--- a/powertools-e2e-tests/handlers/pom.xml
+++ b/powertools-e2e-tests/handlers/pom.xml
@@ -205,7 +205,7 @@
                 <jdk>[21,)</jdk>
             </activation>
             <properties>
-                <aspectj.version>1.9.21.M1</aspectj.version>
+                <aspectj.version>1.9.21</aspectj.version>
             </properties>
         </profile>
     </profiles>