diff --git a/docs/src/main/asciidoc/building-native-image.adoc b/docs/src/main/asciidoc/building-native-image.adoc
index d7d2c1fc0df20..d67857daa6cca 100644
--- a/docs/src/main/asciidoc/building-native-image.adoc
+++ b/docs/src/main/asciidoc/building-native-image.adoc
@@ -615,8 +615,16 @@ If you need SSL support in your native executable, you can easily include the ne
 Please see xref:native-and-ssl.adoc#working-with-containers[our Using SSL With Native Executables guide] for more information.
 ====
 
-NOTE: To use Mandrel instead of GraalVM CE, update the `FROM` clause to: `FROM quay.io/quarkus/ubi-quarkus-mandrel-builder-image:$TAG AS build`.
+[NOTE]
+====
+To use Mandrel instead of GraalVM CE, update the `FROM` clause to: `FROM quay.io/quarkus/ubi-quarkus-mandrel-builder-image:$TAG AS build`.
 `$TAG` can be found on the https://quay.io/repository/quarkus/ubi-quarkus-mandrel-builder-image?tab=tags[Quarkus Mandrel Images Tags page].
+====
+
+[NOTE]
+====
+Starting with 22.3, Mandrel does not provide a `-java11` variant anymore. Use the `-java17` image instead.
+====
 
 === Using a Distroless base image
 
diff --git a/docs/src/main/asciidoc/native-reference.adoc b/docs/src/main/asciidoc/native-reference.adoc
index 8f8264bfa0db6..44fd4062fd6c3 100644
--- a/docs/src/main/asciidoc/native-reference.adoc
+++ b/docs/src/main/asciidoc/native-reference.adoc
@@ -215,6 +215,13 @@ quarkus.container-image.build=true
 quarkus.container-image.group=test
 ----
 
+[IMPORTANT]
+====
+Starting with 22.3, Mandrel does not provide a `-java11` version anymore.
+Note, however,  that this doesn't mean that you may no longer produce native executables with Mandrel for Java 11 projects.
+You can still compile your Java 11 projects using OpenJDK 11 and produce native executables from the resulting Java 11 bytecode using the `-java17` Mandrel builder images.
+====
+
 === First Debugging Steps
 
 As a first step, change to the project directory and build the native executable for the application: