diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 3accd9ee0..2efaa001c 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-  implementation("info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.9.11")
+  implementation("info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.15.0")
   implementation("io.franzbecker:gradle-lombok:5.0.0")
 
   // Spotless dropped Java 8 support in version 2.33.0
diff --git a/buildSrc/src/main/groovy/project-convention-code-formatting-internal.gradle b/buildSrc/src/main/groovy/project-convention-code-formatting-internal.gradle
index 5da3528c4..d468bf0c7 100644
--- a/buildSrc/src/main/groovy/project-convention-code-formatting-internal.gradle
+++ b/buildSrc/src/main/groovy/project-convention-code-formatting-internal.gradle
@@ -12,6 +12,11 @@ spotless {
 
 scalafix {
     configFile.set(project.rootProject.file("scalafix.conf"))
+
+    if (project.name != "yubico-util-scala") {
+        // yubico-util-scala is the only subproject with Scala sources in the "main" source set
+        ignoreSourceSets.add("main")
+    }
 }
 
 project.dependencies.scalafix("com.github.liancheng:organize-imports_2.13:0.6.0")
diff --git a/buildSrc/src/main/kotlin/project-convention-pitest.gradle.kts b/buildSrc/src/main/kotlin/project-convention-pitest.gradle.kts
index 4bd829dfb..0bd7a5104 100644
--- a/buildSrc/src/main/kotlin/project-convention-pitest.gradle.kts
+++ b/buildSrc/src/main/kotlin/project-convention-pitest.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 pitest {
-    pitestVersion.set("1.9.5")
+    pitestVersion.set("1.15.0")
     timestampedReports.set(false)
 
     outputFormats.set(listOf("XML", "HTML"))
diff --git a/webauthn-server-attestation/build.gradle.kts b/webauthn-server-attestation/build.gradle.kts
index 1b331539e..1748835d2 100644
--- a/webauthn-server-attestation/build.gradle.kts
+++ b/webauthn-server-attestation/build.gradle.kts
@@ -86,7 +86,3 @@ tasks.javadoc.configure {
   // Use this instead for local testing
   //(options as StandardJavadocDocletOptions).linksOffline("file://${coreJavadoc.destinationDir}", "${coreJavadoc.destinationDir}")
 }
-
-scalafix {
-  ignoreSourceSets.add("main")
-}
diff --git a/webauthn-server-core/build.gradle.kts b/webauthn-server-core/build.gradle.kts
index cc1d311e3..9bbd2bda8 100644
--- a/webauthn-server-core/build.gradle.kts
+++ b/webauthn-server-core/build.gradle.kts
@@ -68,7 +68,3 @@ tasks.withType(Jar::class) {
     ))
   }
 }
-
-scalafix {
-  ignoreSourceSets.add("main")
-}
diff --git a/webauthn-server-demo/build.gradle.kts b/webauthn-server-demo/build.gradle.kts
index c0fb5f773..82830c46e 100644
--- a/webauthn-server-demo/build.gradle.kts
+++ b/webauthn-server-demo/build.gradle.kts
@@ -71,7 +71,3 @@ for (task in listOf(tasks.installDist, tasks.distZip, tasks.distTar)) {
     }
   }
 }
-
-scalafix {
-  ignoreSourceSets.add("main")
-}
diff --git a/yubico-util/build.gradle.kts b/yubico-util/build.gradle.kts
index 4d503d950..e8319c120 100644
--- a/yubico-util/build.gradle.kts
+++ b/yubico-util/build.gradle.kts
@@ -49,7 +49,3 @@ tasks.jar {
     ))
   }
 }
-
-scalafix {
-  ignoreSourceSets.add("main")
-}