diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index c492582a81fa..2b64ccd8e1a2 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 	`kotlin-library-conventions`
 }
 
-val modularProjects: List<Project> by rootProject.extra
+val modularProjects: List<Project> by rootProject
 
 // Because we need to set up Javadoc aggregation
 modularProjects.forEach { evaluationDependsOn(it.path) }
@@ -50,6 +50,7 @@ asciidoctorj {
 
 val snapshot = rootProject.version.toString().contains("SNAPSHOT")
 val docsVersion = if (snapshot) "snapshot" else rootProject.version
+val releaseBranch = if (snapshot) "master" else "r${rootProject.version}"
 val docsDir = file("$buildDir/ghpages-docs")
 val replaceCurrentDocs = project.hasProperty("replaceCurrentDocs")
 val uploadPdfs = !snapshot
@@ -150,15 +151,15 @@ tasks {
 		attributes(mapOf(
 				"linkToPdf" to uploadPdfs,
 				"jupiter-version" to version,
-				"platform-version" to project.properties["platformVersion"],
-				"vintage-version" to project.properties["vintageVersion"],
+				"platform-version" to project.property("platformVersion"),
+				"vintage-version" to project.property("vintageVersion"),
 				"bom-version" to version,
 				"junit4-version" to Versions.junit4,
 				"apiguardian-version" to Versions.apiGuardian,
 				"ota4j-version" to Versions.ota4j,
 				"surefire-version" to Versions.surefire,
-				"release-branch" to project.properties["releaseBranch"],
-				"docs-version" to project.properties["docsVersion"],
+				"release-branch" to releaseBranch,
+				"docs-version" to docsVersion,
 				"revnumber" to version,
 				"consoleLauncherOptionsFile" to consoleLauncherOptionsFile,
 				"experimentalApisTableFile" to experimentalApisTableFile,
diff --git a/gradle.properties b/gradle.properties
index 43822ae52c04..73089f2efa04 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,6 @@ vintageGroup    = org.junit.vintage
 vintageVersion  = 5.6.2-SNAPSHOT
 
 defaultBuiltBy  = JUnit Team
-releaseBranch   = master
 
 # We need more metaspace due to apparent memory leak in Asciidoctor/JRuby
 org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError