diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index c5307ebd..7aea770a 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -42,11 +42,11 @@ Improvement::
 * Add `setContext` function to StructuralNode.
 
 * Add command line option --failure-level to force non-zero exit code from AsciidoctorJ CLI if specified logging level is reached. (#1114)
-* Upgrade to asciidoctorj 2.0.20 (#1208)
-* Upgrade to asciidoctorj-pdf 2.3.10 (#1256)
+* Upgrade to asciidoctorj 2.0.23 (#1280)
+* Upgrade to asciidoctorj-pdf 2.3.18 (#1280)
 * Upgrade to asciidoctorj-revealjs 5.1.0 (#1256)
-* Upgrade to asciidoctorj-diagram 2.2.14 (#1256)
-* Upgrade to JRuby 9.4.5.0 (#1256)
+* Upgrade to asciidoctorj-diagram 2.3.1 (#1280)
+* Upgrade to JRuby 9.4.8.0 (#1280)
 * Upgrade to tilt 2.0.11 (#1109)
 * Upgrade to asciimath 2.0.4 (#1109)
 * Expose `sectnum` property in Section interface (#1121)
diff --git a/asciidoctorj-distribution/build.gradle b/asciidoctorj-distribution/build.gradle
index 0a9f1cde..624b054c 100644
--- a/asciidoctorj-distribution/build.gradle
+++ b/asciidoctorj-distribution/build.gradle
@@ -21,6 +21,12 @@ dependencies {
   implementation("org.asciidoctor:asciidoctorj-diagram-plantuml:$asciidoctorjDiagramPlantumlVersion") {
     transitive = false
   }
+  implementation("org.asciidoctor:asciidoctorj-diagram-jsyntrax:$asciidoctorjDiagramJsyntraxVersion") {
+    transitive = false
+  }
+  implementation("org.asciidoctor:asciidoctorj-diagram-batik:$asciidoctorjDiagramBatikVersion") {
+    transitive = false
+  }
   implementation("org.asciidoctor:asciidoctorj-pdf:$asciidoctorjPdfVersion") {
     transitive = false
   }
diff --git a/build.gradle b/build.gradle
index 9ef9118d..6b40db16 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,17 +67,19 @@ ext {
   // jar versions
   arquillianVersion = '1.6.0.Final'
   arquillianSpockVersion = '1.0.0.CR1'
-  asciidoctorjPdfVersion = '2.3.10'
-  asciidoctorjEpub3Version = '1.5.1'
-  asciidoctorjDiagramVersion = '2.2.13'
+  asciidoctorjPdfVersion = '2.3.18'
+  asciidoctorjEpub3Version = '2.1.3'
+  asciidoctorjDiagramVersion = '2.3.1'
   asciidoctorjDiagramDitaaMiniVersion = '1.0.3'
-  asciidoctorjDiagramPlantumlVersion = '1.2023.12'
+  asciidoctorjDiagramJsyntraxVersion = '1.38.1'
+  asciidoctorjDiagramBatikVersion = '1.17'
+  asciidoctorjDiagramPlantumlVersion = '1.2024.5'
   asciidoctorjRevealJsVersion = '5.1.0'
   commonsioVersion = '2.15.1'
   guavaVersion = '18.0'
   hamcrestVersion = '1.3'
   jcommanderVersion = '1.82'
-  jrubyVersion = '9.4.5.0'
+  jrubyVersion = '9.4.8.0'
   jsoupVersion = '1.17.1'
   junit4Version = '4.13.2'
   junit5Version = '5.10.1'
@@ -89,7 +91,7 @@ ext {
   pdfboxVersion = '3.0.0'
 
   // gem versions
-  asciidoctorGemVersion = project.hasProperty('asciidoctorGemVersion') ? project.asciidoctorGemVersion : '2.0.20'
+  asciidoctorGemVersion = project.hasProperty('asciidoctorGemVersion') ? project.asciidoctorGemVersion : '2.0.23'
   asciimathGemVersion = '2.0.4'
   coderayGemVersion = '1.1.3'
   rougeGemVersion = '3.30.0'