diff --git a/buildSrc/src/main/kotlin/sbom.kt b/buildSrc/src/main/kotlin/sbom.kt
index 8bfbf8ea03b..137a74ee350 100644
--- a/buildSrc/src/main/kotlin/sbom.kt
+++ b/buildSrc/src/main/kotlin/sbom.kt
@@ -47,8 +47,11 @@ fun Project.configureSbom(
         }
     }
 
-    val spdxSbomTask = tasks.named<SpdxSbomTask>("spdxSbomFor$targetName")
-    val sbomFile = layout.buildDirectory.file("spdx/$targetName.spdx.json")
+    val sbomOutputDirectory = layout.buildDirectory.dir("spdx/$targetName")
+    val spdxSbomTask = tasks.named<SpdxSbomTask>("spdxSbomFor$targetName") {
+        outputDirectory.set(sbomOutputDirectory)
+    }
+    val sbomFile = sbomOutputDirectory.map { it.file("$targetName.spdx.json") }
     val sbomCfg = configurations.maybeCreate("sbomFor$targetName").apply {
         isCanBeResolved = false
         isCanBeConsumed = true