diff --git a/fdb-record-layer-jmh/fdb-record-layer-jmh.gradle b/fdb-record-layer-jmh/fdb-record-layer-jmh.gradle
index 4db5587e64..e67d5cfebf 100644
--- a/fdb-record-layer-jmh/fdb-record-layer-jmh.gradle
+++ b/fdb-record-layer-jmh/fdb-record-layer-jmh.gradle
@@ -34,6 +34,10 @@ dependencies {
     testCompileOnly(libs.bundles.test.compileOnly)
 }
 
+generateJmhProto {
+    dependsOn "extractIncludeProto"
+}
+
 jmh {
     environment = rootProject.ext.fdbEnvironment
 }
diff --git a/fdb-relational-cli/fdb-relational-cli.gradle b/fdb-relational-cli/fdb-relational-cli.gradle
index 3d3d85f759..0aef3da15c 100644
--- a/fdb-relational-cli/fdb-relational-cli.gradle
+++ b/fdb-relational-cli/fdb-relational-cli.gradle
@@ -84,6 +84,9 @@ jar {
     from {
         configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     }
+
+    dependsOn ':fdb-extensions:jar'
+    dependsOn ':fdb-record-layer-core:jar'
     dependsOn ':fdb-relational-api:jar'
     dependsOn ':fdb-relational-core:jar'
     dependsOn ':fdb-relational-grpc:jar'