diff --git a/settings.gradle b/settings.gradle
index e893fe9..05dd9c2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,16 @@
 pluginManagement {
+	resolutionStrategy {
+		eachPlugin {
+			if (requested.id.namespace?.startsWith('org.asciidoctor.jvm')) {
+				useVersion("4.0.1")
+			}
+		}
+	}
 	plugins {
 		id 'io.spring.nohttp' version "0.0.11"
 		id 'org.springframework.boot' version "2.6.15"
+		id 'org.asciidoctor.jvm.pdf'
+		id 'org.asciidoctor.jvm.convert'
 	}
 	repositories {
 		gradlePluginPortal()
diff --git a/spring-cloud-app-broker-docs/build.gradle b/spring-cloud-app-broker-docs/build.gradle
index eae3818..de0f64c 100644
--- a/spring-cloud-app-broker-docs/build.gradle
+++ b/spring-cloud-app-broker-docs/build.gradle
@@ -18,8 +18,8 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
 plugins {
 	id 'org.springframework.boot' apply false
-	id 'org.asciidoctor.jvm.pdf' version '3.3.2'
-	id 'org.asciidoctor.jvm.convert' version '3.3.2'
+	id 'org.asciidoctor.jvm.convert'
+	id 'org.asciidoctor.jvm.pdf'
 }
 
 description = "Spring Cloud App Broker Documentation"
@@ -53,6 +53,7 @@ task prepareAsciidocBuild(type: Sync) {
 }
 
 asciidoctorPdf {
+	dependsOn prepareAsciidocBuild
 	baseDirFollowsSourceFile()
 
 	asciidoctorj {