diff --git a/src/main/kotlin/com/ioki/sentry/proguard/gradle/plugin/SentryProguardGradlePlugin.kt b/src/main/kotlin/com/ioki/sentry/proguard/gradle/plugin/SentryProguardGradlePlugin.kt
index fb31a1d..96eca7a 100644
--- a/src/main/kotlin/com/ioki/sentry/proguard/gradle/plugin/SentryProguardGradlePlugin.kt
+++ b/src/main/kotlin/com/ioki/sentry/proguard/gradle/plugin/SentryProguardGradlePlugin.kt
@@ -25,7 +25,7 @@ private fun Project.replaceSentryProguardUuidInAndroidManifest(
     sentryProguardExtension: SentryProguardExtension,
 ) {
     val downloadSentryCliTask = tasks.registerDownloadSentryCliTask(
-        objects.fileProperty().fileValue(buildDir.resolve(SENTRY_CLI_FILE_PATH))
+        layout.buildDirectory.file(SENTRY_CLI_FILE_PATH),
     )
 
     extension.onVariants { variant ->
diff --git a/src/main/kotlin/com/ioki/sentry/proguard/gradle/plugin/tasks/UploadUuidToSentryTask.kt b/src/main/kotlin/com/ioki/sentry/proguard/gradle/plugin/tasks/UploadUuidToSentryTask.kt
index e2d74bf..93e2ec1 100644
--- a/src/main/kotlin/com/ioki/sentry/proguard/gradle/plugin/tasks/UploadUuidToSentryTask.kt
+++ b/src/main/kotlin/com/ioki/sentry/proguard/gradle/plugin/tasks/UploadUuidToSentryTask.kt
@@ -2,11 +2,16 @@ package com.ioki.sentry.proguard.gradle.plugin.tasks
 
 import com.ioki.sentry.proguard.gradle.plugin.SentryProguardExtension
 import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFile
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.logging.LogLevel
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
-import org.gradle.api.tasks.*
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.TaskContainer
+import org.gradle.api.tasks.TaskProvider
 import org.gradle.process.ExecOperations
 import javax.inject.Inject
 
@@ -64,8 +69,8 @@ internal abstract class UploadUuidToSentryTask : DefaultTask() {
     @get:Inject
     abstract val execOperations: ExecOperations
 
-    private val mappingFilePath: Provider<String> = variantName.map {
-        "${project.buildDir}/outputs/mapping/$it/mapping.txt"
+    private val mappingFilePath: Provider<RegularFile> = variantName.flatMap {
+        project.layout.buildDirectory.file("outputs/mapping/$it/mapping.txt")
     }
 
     @TaskAction
@@ -76,7 +81,7 @@ internal abstract class UploadUuidToSentryTask : DefaultTask() {
             "upload-proguard",
             "--uuid",
             uuid.get(),
-            mappingFilePath.get(),
+            mappingFilePath.get().asFile.path,
             "--org",
             sentryOrg.get(),
             "--project",