diff --git a/docs/src/docs/asciidoc/gradle-plugin.adoc b/docs/src/docs/asciidoc/gradle-plugin.adoc
index 0bd36bb9b..2abc253f4 100644
--- a/docs/src/docs/asciidoc/gradle-plugin.adoc
+++ b/docs/src/docs/asciidoc/gradle-plugin.adoc
@@ -363,7 +363,7 @@ NOTE: This version of the plugin defaults to the using the metadata repository i
 
 === Configuring the metadata repository
 
-Metadata repository is enabled by default. Support can be disabled explicitly:
+Metadata repository support is enabled by default. Support can be disabled explicitly:
 
 .Disabling the metadata repository
 [source, groovy, role="multi-language-sample"]
@@ -403,7 +403,7 @@ include::../snippets/gradle/groovy/build.gradle[tags=specify-metadata-repository
 include::../snippets/gradle/kotlin/build.gradle.kts[tags=specify-metadata-repository-file]
 ----
 
-For each library included in the native image, the plugin will automatically search for GraalVM reachability metadata in the repository.
+For each library included in the native image, the plugin will automatically search for GraalVM image build configuration metadata in the repository.
 In some cases, you may need to exclude a particular module from the search.
 This can be done by adding it to the exclude list:
 
diff --git a/docs/src/docs/asciidoc/maven-plugin.adoc b/docs/src/docs/asciidoc/maven-plugin.adoc
index 7c7e3edeb..15ede5a86 100644
--- a/docs/src/docs/asciidoc/maven-plugin.adoc
+++ b/docs/src/docs/asciidoc/maven-plugin.adoc
@@ -658,7 +658,7 @@ include::../../../../samples/native-config-integration/pom.xml[tag=metadata-loca
 ----
 <1> The local path can point to an _exploded_ directory, or to a compressed ZIP file.
 
-For each library included in the native image, the plugin will automatically search for GraalVM reachability metadata in the repository that was released together with the plugin.
+For each library included in the native image, the plugin will automatically search for GraalVM image build configuration metadata in the repository that was released together with the plugin.
 In case you want to use another version of the metadata use:
 
 .Choosing a version for the metadata repository
diff --git a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/MetadataRepositoryFunctionalTest.groovy b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/MetadataRepositoryFunctionalTest.groovy
index 3f7856d44..341e50f7e 100644
--- a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/MetadataRepositoryFunctionalTest.groovy
+++ b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/MetadataRepositoryFunctionalTest.groovy
@@ -96,7 +96,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
 
         then:
         buildFailed
-        outputContains " Cannot pull GraalVM reachability metadata repository either from the one specified in the configuration or the default one"
+        outputContains "Cannot pull GraalVM reachability metadata repository either from the one specified in the configuration or the default one"
     }
 
     void "it can exclude dependencies"() {
diff --git a/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/AbstractNativeMojo.java b/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/AbstractNativeMojo.java
index bd5e3b3f3..bfe70a5d5 100644
--- a/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/AbstractNativeMojo.java
+++ b/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/AbstractNativeMojo.java
@@ -166,7 +166,7 @@ private Path getDefaultRepo(Path destinationRoot) {
             String metadataUrl = String.format(METADATA_REPO_URL_TEMPLATE, VersionInfo.METADATA_REPO_VERSION);
             try {
                 targetUrl = new URI(metadataUrl).toURL();
-                // TODO investigate if the following line is necessary
+                // TODO investigate if the following line is necessary (Issue: https://github.com/graalvm/native-build-tools/issues/560)
                 metadataRepositoryConfiguration.setUrl(targetUrl);
             } catch (URISyntaxException | MalformedURLException e) {
                 throw new RuntimeException(e);
@@ -199,7 +199,7 @@ private Path getRepo(Path destinationRoot) {
                     String metadataUrl = String.format(METADATA_REPO_URL_TEMPLATE, version);
                     try {
                         targetUrl = new URI(metadataUrl).toURL();
-                        // TODO investigate if the following line is necessary
+                        // TODO investigate if the following line is necessary (Issue: https://github.com/graalvm/native-build-tools/issues/560)
                         metadataRepositoryConfiguration.setUrl(targetUrl);
                     } catch (URISyntaxException | MalformedURLException e) {
                         throw new RuntimeException(e);