diff --git a/partiql-eval/build.gradle.kts b/partiql-eval/build.gradle.kts
index 7778690e1..e169ad8a7 100644
--- a/partiql-eval/build.gradle.kts
+++ b/partiql-eval/build.gradle.kts
@@ -43,6 +43,26 @@ kotlin {
     explicitApi = null
 }
 
+tasks.shadowJar {
+    configurations = listOf(project.configurations.shadow.get())
+}
+
+// Workaround for https://github.com/johnrengelman/shadow/issues/651
+components.withType(AdhocComponentWithVariants::class.java).forEach { c ->
+    c.withVariantsFromConfiguration(project.configurations.shadowRuntimeElements.get()) {
+        skip()
+    }
+}
+
+// Need to add this as we have both Java and Kotlin sources. Dokka already handles multi-language projects. If
+// Javadoc is enabled, we end up overwriting index.html (causing compilation errors).
+tasks.withType<Javadoc>() {
+    enabled = false
+}
+tasks.withType<Jar>() {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
 publish {
     artifactId = "partiql-eval"
     name = "PartiQL Lang Kotlin Evaluator"