diff --git a/build.gradle b/build.gradle
index ede9d228a..8fe27b5cd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -275,6 +275,11 @@ subprojects {
           attributes 'Main-Class': mainClass
         }
       }
+      // Build as a multi-release jar since we've got member jars (e.g., dnsjava
+      // and snakeyaml) that are multi-release.
+      manifest {
+        attributes 'Multi-Release': true
+      }
       zip64 = true
       archiveClassifier = ''
       archiveVersion = ''
diff --git a/core/gradle.lockfile b/core/gradle.lockfile
index ab5ff1719..8f8198f08 100644
--- a/core/gradle.lockfile
+++ b/core/gradle.lockfile
@@ -239,7 +239,7 @@ commons-collections:commons-collections:3.2.2=checkstyle
 commons-dbutils:commons-dbutils:1.8.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-logging:commons-logging:1.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-dnsjava:dnsjava:3.5.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+dnsjava:dnsjava:3.6.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 guru.nidi.com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0=testRuntimeClasspath
 guru.nidi.com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0=testRuntimeClasspath
 guru.nidi.com.eclipsesource.j2v8:j2v8_win32_x86:4.6.0=testRuntimeClasspath
diff --git a/dependencies.gradle b/dependencies.gradle
index 7c4156791..083e298ba 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -156,8 +156,7 @@ ext {
       'com.sun.xml.bind:jaxb-osgi:[4.0.5,)',
       'com.zaxxer:HikariCP:[3.4.5,)',
       'commons-codec:commons-codec:[1.15,)',
-      // TODO(b/358421673): v3.6 breaks schema-compatibility tests.
-      'dnsjava:dnsjava:[3.3.1,3.6)!!',
+      'dnsjava:dnsjava:[3.3.1,)',
       'guru.nidi:graphviz-java-all-j2v8:[0.17.0,)',
       'io.github.classgraph:classgraph:[4.8.102,)',
       'io.github.java-diff-utils:java-diff-utils:[4.9,)',
diff --git a/jetty/gradle.lockfile b/jetty/gradle.lockfile
index 2986e4566..3dd41b5c7 100644
--- a/jetty/gradle.lockfile
+++ b/jetty/gradle.lockfile
@@ -197,7 +197,7 @@ commons-collections:commons-collections:3.2.2=checkstyle
 commons-dbutils:commons-dbutils:1.8.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 commons-io:commons-io:2.16.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 commons-logging:commons-logging:1.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-dnsjava:dnsjava:3.5.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
+dnsjava:dnsjava:3.6.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 info.picocli:picocli:4.6.2=checkstyle
 io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.github.classgraph:classgraph:4.8.162=deploy_jar,runtimeClasspath,testRuntimeClasspath
diff --git a/services/backend/gradle.lockfile b/services/backend/gradle.lockfile
index ff3ba6b64..5a5734581 100644
--- a/services/backend/gradle.lockfile
+++ b/services/backend/gradle.lockfile
@@ -176,7 +176,7 @@ commons-codec:commons-codec:1.17.1=compileClasspath,runtimeClasspath,testCompile
 commons-dbutils:commons-dbutils:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-dnsjava:dnsjava:3.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+dnsjava:dnsjava:3.6.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.github.classgraph:classgraph:4.8.162=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.github.java-diff-utils:java-diff-utils:4.12=runtimeClasspath,testRuntimeClasspath
diff --git a/services/bsa/gradle.lockfile b/services/bsa/gradle.lockfile
index ff3ba6b64..5a5734581 100644
--- a/services/bsa/gradle.lockfile
+++ b/services/bsa/gradle.lockfile
@@ -176,7 +176,7 @@ commons-codec:commons-codec:1.17.1=compileClasspath,runtimeClasspath,testCompile
 commons-dbutils:commons-dbutils:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-dnsjava:dnsjava:3.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+dnsjava:dnsjava:3.6.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.github.classgraph:classgraph:4.8.162=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.github.java-diff-utils:java-diff-utils:4.12=runtimeClasspath,testRuntimeClasspath
diff --git a/services/default/gradle.lockfile b/services/default/gradle.lockfile
index ff3ba6b64..5a5734581 100644
--- a/services/default/gradle.lockfile
+++ b/services/default/gradle.lockfile
@@ -176,7 +176,7 @@ commons-codec:commons-codec:1.17.1=compileClasspath,runtimeClasspath,testCompile
 commons-dbutils:commons-dbutils:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-dnsjava:dnsjava:3.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+dnsjava:dnsjava:3.6.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.github.classgraph:classgraph:4.8.162=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.github.java-diff-utils:java-diff-utils:4.12=runtimeClasspath,testRuntimeClasspath
diff --git a/services/pubapi/gradle.lockfile b/services/pubapi/gradle.lockfile
index ff3ba6b64..5a5734581 100644
--- a/services/pubapi/gradle.lockfile
+++ b/services/pubapi/gradle.lockfile
@@ -176,7 +176,7 @@ commons-codec:commons-codec:1.17.1=compileClasspath,runtimeClasspath,testCompile
 commons-dbutils:commons-dbutils:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-dnsjava:dnsjava:3.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+dnsjava:dnsjava:3.6.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.github.classgraph:classgraph:4.8.162=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.github.java-diff-utils:java-diff-utils:4.12=runtimeClasspath,testRuntimeClasspath
diff --git a/services/tools/gradle.lockfile b/services/tools/gradle.lockfile
index ff3ba6b64..5a5734581 100644
--- a/services/tools/gradle.lockfile
+++ b/services/tools/gradle.lockfile
@@ -176,7 +176,7 @@ commons-codec:commons-codec:1.17.1=compileClasspath,runtimeClasspath,testCompile
 commons-dbutils:commons-dbutils:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-dnsjava:dnsjava:3.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+dnsjava:dnsjava:3.6.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.github.classgraph:classgraph:4.8.162=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.github.java-diff-utils:java-diff-utils:4.12=runtimeClasspath,testRuntimeClasspath