diff --git a/animal-sniffer-signature/build.gradle.kts b/animal-sniffer-signature/build.gradle.kts
index f9e67347a07..be649012e55 100644
--- a/animal-sniffer-signature/build.gradle.kts
+++ b/animal-sniffer-signature/build.gradle.kts
@@ -22,9 +22,6 @@ val generatedSignature = configurations.create("generatedSignature") {
   isCanBeConsumed = true
   isCanBeResolved = false
 }
-configurations.add(signatureJar)
-configurations.add(signatureJarClasspath)
-configurations.add(generatedSignature)
 
 dependencies {
   signature("com.toasttab.android:gummy-bears-api-23:0.12.0@signature")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index fd3489aecaf..7aa0f156dc8 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -58,7 +58,7 @@ dependencies {
   implementation("com.squareup:javapoet:1.13.0")
   implementation("com.squareup.wire:wire-compiler")
   implementation("com.squareup.wire:wire-gradle-plugin")
-  implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
+  implementation("com.google.protobuf:protobuf-gradle-plugin:0.9.4")
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
   implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
index bd360ccf0e5..fcb71b09299 100644
--- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
@@ -178,12 +178,13 @@ plugins.withId("otel.publish-conventions") {
     register("generateVersionResource") {
       val moduleName = otelJava.moduleName
       val propertiesDir = moduleName.map { File(layout.buildDirectory.asFile.get(), "generated/properties/${it.replace('.', '/')}") }
+      val versionProperty = project.version.toString()
 
-      inputs.property("project.version", project.version.toString())
+      inputs.property("project.version", versionProperty)
       outputs.dir(propertiesDir)
 
       doLast {
-        File(propertiesDir.get(), "version.properties").writeText("sdk.version=${project.version}")
+        File(propertiesDir.get(), "version.properties").writeText("sdk.version=${versionProperty}")
       }
     }
   }
diff --git a/custom-checks/build.gradle.kts b/custom-checks/build.gradle.kts
index 22ce0614b30..adce219eff0 100644
--- a/custom-checks/build.gradle.kts
+++ b/custom-checks/build.gradle.kts
@@ -76,7 +76,7 @@ tasks.withType<Javadoc>().configureEach {
 configurations {
   named("errorprone") {
     dependencies.removeIf {
-      it is ProjectDependency && it.dependencyProject == project
+      it is ProjectDependency && it.name == project.name
     }
   }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 78cb6e16a49..3e781fbad9c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts
index f9164a07093..06b15eeac9c 100644
--- a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts
+++ b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts
@@ -79,4 +79,9 @@ tasks {
       compilerArgs.add("-Xlint:-serial")
     }
   }
+
+  checkstyleMain {
+    // overrides the default which includes generated proto sources
+    source = fileTree("src/main/java")
+  }
 }