diff --git a/jvm/src/main/groovy/org/asciidoctor/gradle/remote/AsciidoctorJSetup.groovy b/jvm/src/main/groovy/org/asciidoctor/gradle/remote/AsciidoctorJSetup.groovy
index e6ec74ce7..a9179fe2e 100644
--- a/jvm/src/main/groovy/org/asciidoctor/gradle/remote/AsciidoctorJSetup.groovy
+++ b/jvm/src/main/groovy/org/asciidoctor/gradle/remote/AsciidoctorJSetup.groovy
@@ -16,7 +16,11 @@
 package org.asciidoctor.gradle.remote
 
 import groovy.transform.CompileStatic
+import org.asciidoctor.Attributes
+import org.asciidoctor.AttributesBuilder
 import org.asciidoctor.Options
+import org.asciidoctor.OptionsBuilder
+import org.asciidoctor.SafeMode
 import org.asciidoctor.gradle.internal.ExecutorConfiguration
 
 /**
@@ -55,46 +59,43 @@ class AsciidoctorJSetup implements Serializable {
      * @return Asciidoctor options
      */
     @SuppressWarnings('DuplicateStringLiteral ')
-    Map<String, Object> normalisedOptionsFor(final File file, ExecutorConfiguration runConfiguration) {
-        Map<String, Object> mergedOptions = [:]
+    Options normalisedOptionsFor(final File file, ExecutorConfiguration runConfiguration) {
+        OptionsBuilder optionsBuilder = Options.builder()
 
         runConfiguration.with {
             final String srcRelative = getRelativePath(file.parentFile, sourceDir)
 
-            mergedOptions.putAll(options)
-            mergedOptions.putAll([
-                    (Options.BACKEND) : backendName,
-                    (Options.IN_PLACE): false,
-                    (Options.SAFE)    : safeModeLevel,
-                    (Options.TO_DIR)  : (srcRelative.empty ? outputDir : new File(outputDir, srcRelative)).absolutePath,
-                    (Options.MKDIRS)  : true
-            ])
+            options.each { key, value -> optionsBuilder.option(key, value) }
+            optionsBuilder.backend(backendName)
+            optionsBuilder.inPlace(false)
+            optionsBuilder.safe(SafeMode.safeMode(safeModeLevel))
+            optionsBuilder.toDir((srcRelative.empty ? outputDir : new File(outputDir, srcRelative)))
+            optionsBuilder.mkDirs(true)
+            optionsBuilder.baseDir(baseDir ?: file.parentFile)
 
-            mergedOptions[Options.BASEDIR] = (baseDir ?: file.parentFile).absolutePath
-
-            if (mergedOptions.containsKey(Options.TO_FILE)) {
-                Object toFileValue = mergedOptions[Options.TO_FILE]
-                Object toDirValue = mergedOptions.remove(Options.TO_DIR)
+            if (options.containsKey(Options.TO_FILE)) {
+                Object toFileValue = options[Options.TO_FILE]
+                Object toDirValue = options.remove(Options.TO_DIR)
                 File toFile = toFileValue instanceof File ? (File) toFileValue : new File(toFileValue.toString())
                 File toDir = toDirValue instanceof File ? (File) toDirValue : new File(toDirValue.toString())
-                mergedOptions[Options.TO_FILE] = new File(toDir, toFile.name).absolutePath
+                optionsBuilder.toFile(new File(toDir, toFile.name))
             }
 
-            Map<String, Object> newAttrs = [:]
-            newAttrs.putAll(attributes)
-            newAttrs[ATTR_PROJECT_DIR] = projectDir.absolutePath
-            newAttrs[ATTR_ROOT_DIR] = rootDir.absolutePath
-            newAttrs[ATTR_REL_SRC_DIR] = getRelativePath(sourceDir, file.parentFile) ?: '.'
+            AttributesBuilder attributesBuilder = Attributes.builder()
+            attributes.each { key, value -> attributesBuilder.attribute(key, value) }
+            attributesBuilder.attribute(ATTR_PROJECT_DIR, projectDir.absolutePath)
+            attributesBuilder.attribute(ATTR_ROOT_DIR, rootDir.absolutePath)
+            attributesBuilder.attribute(ATTR_REL_SRC_DIR, srcRelative.empty ? '.' : srcRelative)
 
             if (legacyAttributes) {
-                newAttrs['projectdir'] = newAttrs[ATTR_PROJECT_DIR]
-                newAttrs['rootdir'] = newAttrs[ATTR_ROOT_DIR]
+                attributesBuilder.attribute('projectdir', projectDir.absolutePath)
+                attributesBuilder.attribute('rootdir', rootDir.absolutePath)
             }
 
-            mergedOptions[Options.ATTRIBUTES] = newAttrs
+            optionsBuilder.attributes(attributesBuilder.build())
         }
 
-        mergedOptions
+        optionsBuilder.build()
     }
 
     /**
diff --git a/jvm/src/main/groovy/org/asciidoctor/gradle/remote/ExecutorBase.groovy b/jvm/src/main/groovy/org/asciidoctor/gradle/remote/ExecutorBase.groovy
index 90ea17dfe..26cd20ab2 100644
--- a/jvm/src/main/groovy/org/asciidoctor/gradle/remote/ExecutorBase.groovy
+++ b/jvm/src/main/groovy/org/asciidoctor/gradle/remote/ExecutorBase.groovy
@@ -16,6 +16,7 @@
 package org.asciidoctor.gradle.remote
 
 import groovy.transform.CompileStatic
+import org.asciidoctor.Options
 import org.asciidoctor.ast.Cursor
 import org.asciidoctor.gradle.internal.ExecutorConfiguration
 import org.asciidoctor.gradle.internal.ExecutorConfigurationContainer
@@ -64,7 +65,7 @@ abstract class ExecutorBase {
      */
     @SuppressWarnings('DuplicateStringLiteral ')
     protected
-    Map<String, Object> normalisedOptionsFor(final File file, ExecutorConfiguration runConfiguration) {
+    Options normalisedOptionsFor(final File file, ExecutorConfiguration runConfiguration) {
         setup.normalisedOptionsFor(file, runConfiguration)
     }