diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/idto/IDTOSerializerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/idto/IDTOSerializerGenerator.java
index acbd9ecd35b60..c098d5bbdcb6c 100644
--- a/modules/codegen/src/main/java/org/apache/ignite/internal/idto/IDTOSerializerGenerator.java
+++ b/modules/codegen/src/main/java/org/apache/ignite/internal/idto/IDTOSerializerGenerator.java
@@ -38,6 +38,7 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.UUID;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.processing.FilerException;
@@ -394,7 +395,10 @@ else if (isSerializable(type))
 
         throwIfNull(type, serDes);
 
-        boolean nullable = !type.toString().startsWith("@" + NotNull.class.getName());
+        // Can't rely on TypeMirror#toString(): the @NotNull position within the string differs between JDKs.
+        boolean nullable = type.getAnnotationMirrors().stream()
+            .noneMatch(am -> ((TypeElement)am.getAnnotationType().asElement())
+                .getQualifiedName().contentEquals(NotNull.class.getName()));
 
         if (nullable || write)
             return simpleSerdes(serDes, var, type);
@@ -607,7 +611,7 @@ else if (Set.class.getName().equals(className(type)))
 
         Map<String, String> params = Map.of(
             "${var}", var,
-            "${Type}", colEl.toString(),
+            "${Type}", stripAnnotations(colEl.toString()),
             "${CollectionImpl}", simpleName(COLL_IMPL.get(className(type))),
             "${len}", withLevel("len"),
             "${i}", withLevel("i"),
@@ -741,18 +745,26 @@ private Collection<VariableElement> fields(TypeElement type) {
 
     /** @return FQN of {@code comp}. */
     private static String className(TypeMirror comp) {
-        String n = comp.toString();
-
-        int spaceIdx = n.indexOf(' ');
-
-        if (spaceIdx != -1)
-            n = n.substring(spaceIdx + 1);
+        String n = stripAnnotations(comp.toString());
 
         int genIdx = n.indexOf('<');
 
         return genIdx == -1 ? n : n.substring(0, genIdx);
     }
 
+    /** Type-use annotation with an optional trailing whitespace, e.g. {@code @NotNull} in {@code java.util.@NotNull List}. */
+    private static final Pattern TYPE_ANNOTATION = Pattern.compile("@[\\w.]+\\s*");
+
+    /**
+     * @param type Type string.
+     * @return Type string without type-use annotations. {@link TypeMirror#toString()} renders them at a JDK-dependent
+     * position ({@code @NotNull java.util.List} on JDK 17, {@code java.util.@NotNull List} on JDK 21+), so they are
+     * stripped to obtain a stable fully qualified type name.
+     */
+    private static String stripAnnotations(String type) {
+        return TYPE_ANNOTATION.matcher(type).replaceAll("");
+    }
+
     /** @return Serializer class name. */
     private String serializerName() {
         return type.getSimpleName() + "Serializer";
@@ -798,7 +810,7 @@ private String typeWithGeneric(TypeMirror tp) {
 
             generic.append((gt.getKind() == TypeKind.TYPEVAR || gt.getKind() == TypeKind.WILDCARD)
                 ? "Object"
-                : gt.toString());
+                : stripAnnotations(gt.toString()));
         }
 
         return simpleClassName(tp) + generic.append(">");
diff --git a/parent/pom.xml b/parent/pom.xml
index 507e6d27edf36..52e08264d3b61 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -588,6 +588,7 @@
                         <include>**/*.java</include>
                     </includes>
                     <argLine>
+                        -Djava.security.manager=allow
                         --add-opens=java.base/jdk.internal.access=ALL-UNNAMED
                         --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED
                         --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED