diff --git a/build.gradle.kts b/build.gradle.kts
index 0aff62ef..2734226a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -66,7 +66,7 @@ val schemaUrl = "https://opentelemetry.io/schemas/$semanticConventionsVersion"
 
 val downloadSemanticConventions by tasks.registering(Download::class) {
   src(semanticConventionsRepoZip)
-  dest("$buildDir/semantic-conventions-${semanticConventionsVersion}/semantic-conventions.zip")
+  dest(layout.buildDirectory.file("semantic-conventions-${semanticConventionsVersion}/semantic-conventions.zip"))
   overwrite(false)
 }
 
@@ -79,7 +79,7 @@ val unzipConfigurationSchema by tasks.registering(Copy::class) {
     val pathParts = path.split("/")
     path = pathParts.subList(1, pathParts.size).joinToString("/")
   })
-  into("$buildDir/semantic-conventions-${semanticConventionsVersion}/")
+  into(layout.buildDirectory.dir("semantic-conventions-${semanticConventionsVersion}/"))
 }
 
 fun generateTask(taskName: String, incubating: Boolean) {
@@ -102,10 +102,11 @@ fun generateTask(taskName: String, incubating: Boolean) {
       val gid = unix.getGid() // $(id -g $USERNAME)
       listOf("-u", "$uid:$gid")
     }
+    val modelPath = layout.buildDirectory.dir("semantic-conventions-${semanticConventionsVersion}/model").get()
     val weaver_args = listOf(
         "--rm",
         "--platform=linux/x86_64",
-        "--mount", "type=bind,source=$buildDir/semantic-conventions-${semanticConventionsVersion}/model,target=/home/weaver/source,readonly",
+        "--mount", "type=bind,source=${modelPath},target=/home/weaver/source,readonly",
         "--mount", "type=bind,source=$projectDir/buildscripts/templates,target=/home/weaver/templates,readonly",
         "--mount", "type=bind,source=$projectDir/$outputDir,target=/home/weaver/target",
         "otel/weaver:$generatorVersion",
diff --git a/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts
index 5aec55a0..b1c39dcd 100644
--- a/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts
@@ -70,7 +70,7 @@ spotless {
       "*.sh",
       "src/**/*.properties",
     )
-    indentWithSpaces()
+    leadingTabsToSpaces()
     trimTrailingWhitespace()
     endWithNewline()
   }