diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 5acf6fd77cb1..df17b9a2b23e 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -363,7 +363,12 @@ tasks {
 	}
 
 	asciidoctorPdf {
-		setExecutionMode(JAVA_EXEC) // Avoid classpath conflicts with other Gradle plugins (e.g. JReleaser)
+		// Avoid classpath conflicts with other Gradle plugins (e.g. JReleaser)
+		// Avoid propagating apparent memory leaks in Asciidoctor/JRuby to Gradle daemon.
+		setExecutionMode(JAVA_EXEC)
+		jvm {
+			maxHeapSize = "512M"
+		}
 		sources {
 			include("user-guide/index.adoc")
 		}
diff --git a/gradle.properties b/gradle.properties
index cf11159cd350..1a74c14b0915 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,8 +3,7 @@ version = 6.1.0-SNAPSHOT
 # For backward compatibility checks
 apiBaselineVersion = 6.0.1
 
-# We need more metaspace due to apparent memory leak in Asciidoctor/JRuby
-org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx1g -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.configuration-cache.parallel=true