diff --git a/build.gradle b/build.gradle
index 720917b1..bc7f60ee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.eerohele.dita-ot-gradle' version '0.7.1'
+    id 'io.github.jyjeanne.dita-ot-gradle' version '2.3.2'
     id 'com.github.eerohele.saxon-gradle' version '0.9.0-beta4'
 }
 
@@ -18,7 +18,7 @@ dependencies {
     saxon 'net.sf.saxon:Saxon-HE:10.6'
 }
 
-import com.github.eerohele.DitaOtTask
+import com.github.jyjeanne.DitaOtTask
 import com.github.eerohele.SaxonXsltTask
 import org.gradle.process.ExecOperations
 
@@ -41,8 +41,6 @@ String toURI(String path) {
     file(path).toURI().toString()
 }
 
-ditaOt.dir ditaHome
-
 task messages(type: SaxonXsltTask) {
     input "${configDir}/messages.xml"
     output "${projectDirPath}/topics/error-messages.xml"
@@ -99,6 +97,8 @@ task autoGenerate(dependsOn: [messages, params, extensionPoints, generatePlatfor
 }
 
 task pdf(type: DitaOtTask, dependsOn: autoGenerate) {
+    // Set DITA-OT directory: pass as parameter -PditaHome or fall back to parent when run in core repo.
+    ditaOt file(findProperty('ditaHome') ?: ditaHome)
     input "${projectDirPath}/userguide-book.ditamap"
     output outputDir
     transtype 'pdf'
@@ -114,6 +114,8 @@ task pdf(type: DitaOtTask, dependsOn: autoGenerate) {
 }
 
 task html(type: DitaOtTask, dependsOn: autoGenerate) {
+    // Set DITA-OT directory: pass as parameter -PditaHome or fall back to parent when run in core repo.
+    ditaOt file(findProperty('ditaHome') ?: ditaHome)
     input "${projectDirPath}/userguide.ditamap"
     output outputDir
     transtype 'html5'
@@ -133,6 +135,8 @@ task html(type: DitaOtTask, dependsOn: autoGenerate) {
 }
 
 task htmlhelp(type: DitaOtTask, dependsOn: autoGenerate) {
+    // Set DITA-OT directory: pass as parameter -PditaHome or fall back to parent when run in core repo.
+    ditaOt file(findProperty('ditaHome') ?: ditaHome)
     input "${projectDirPath}/userguide.ditamap"
     output outputDir
     transtype 'htmlhelp'
@@ -200,6 +204,8 @@ task gitMetadata {
 task site(type: DitaOtTask) {
     dependsOn 'messages', 'params', 'extensionPoints', 'gitMetadata'
 
+    // Set DITA-OT directory: pass as parameter -PditaHome or fall back to parent when run in core repo.
+    ditaOt file(findProperty('ditaHome') ?: ditaHome)
     input file("${projectDirPath}/site.ditamap")
     output getPropertyOrDefault('outputDir', "${buildDir}/site")
     filter "${projectDirPath}/resources/site.ditaval"