diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index ac67ae261..2efaa001c 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -16,6 +16,6 @@ dependencies {
   // Spotless dropped Java 8 support in version 2.33.0
   if (JavaVersion.current().isJava11Compatible) {
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
-    implementation("io.github.cosmicsilence:gradle-scalafix:0.1.15")
+    implementation("io.github.cosmicsilence:gradle-scalafix:0.2.2")
   }
 }
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 29e7800f9..5da3528c4 100644
--- a/buildSrc/src/main/groovy/project-convention-code-formatting-internal.gradle
+++ b/buildSrc/src/main/groovy/project-convention-code-formatting-internal.gradle
@@ -12,10 +12,6 @@ spotless {
 
 scalafix {
     configFile.set(project.rootProject.file("scalafix.conf"))
-
-    // Work around dependency resolution issues in April 2022
-    semanticdb.autoConfigure.set(true)
-    semanticdb.version.set("4.5.5")
 }
 
 project.dependencies.scalafix("com.github.liancheng:organize-imports_2.13:0.6.0")
diff --git a/webauthn-server-attestation/build.gradle.kts b/webauthn-server-attestation/build.gradle.kts
index 1748835d2..1b331539e 100644
--- a/webauthn-server-attestation/build.gradle.kts
+++ b/webauthn-server-attestation/build.gradle.kts
@@ -86,3 +86,7 @@ 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 9bbd2bda8..cc1d311e3 100644
--- a/webauthn-server-core/build.gradle.kts
+++ b/webauthn-server-core/build.gradle.kts
@@ -68,3 +68,7 @@ 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 82830c46e..c0fb5f773 100644
--- a/webauthn-server-demo/build.gradle.kts
+++ b/webauthn-server-demo/build.gradle.kts
@@ -71,3 +71,7 @@ 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 e8319c120..4d503d950 100644
--- a/yubico-util/build.gradle.kts
+++ b/yubico-util/build.gradle.kts
@@ -49,3 +49,7 @@ tasks.jar {
     ))
   }
 }
+
+scalafix {
+  ignoreSourceSets.add("main")
+}