diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 25ac3afd9..f0dea4275 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -27,7 +27,7 @@ if (Config.includeTelemetry) {
     }
 }
 
-val keystorePropertiesFile = rootProject.file("keystore.properties")
+val keystorePropertiesFile = layout.settingsDirectory.file("keystore.properties").asFile
 
 android {
     namespace = "eu.kanade.tachiyomi"
diff --git a/gradle.properties b/gradle.properties
index f06c14e3a..f012e5a7c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,8 +4,7 @@ kotlin.code.style=official
 
 # Configuration should be synced with [/gradle/build-logic/gradle.properties]
 org.gradle.caching=true
-org.gradle.configuration-cache=true
-org.gradle.configureondemand=true
+org.gradle.isolated-projects=true
 org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.tooling.parallel=true
diff --git a/gradle/build-logic/gradle.properties b/gradle/build-logic/gradle.properties
index 9457ef797..ee9c11a06 100644
--- a/gradle/build-logic/gradle.properties
+++ b/gradle/build-logic/gradle.properties
@@ -3,8 +3,7 @@
 # Gradle properties are not passed to included builds
 # https://github.com/gradle/gradle/issues/2534
 org.gradle.caching=true
-org.gradle.configuration-cache=true
-org.gradle.configureondemand=true
+org.gradle.isolated-projects=true
 org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.tooling.parallel=true
diff --git a/gradle/build-logic/src/main/kotlin/mihon/gradle/BuildInfo.kt b/gradle/build-logic/src/main/kotlin/mihon/gradle/BuildInfo.kt
index c33ab3de0..0460c02cf 100644
--- a/gradle/build-logic/src/main/kotlin/mihon/gradle/BuildInfo.kt
+++ b/gradle/build-logic/src/main/kotlin/mihon/gradle/BuildInfo.kt
@@ -36,7 +36,7 @@ fun Project.getCurrentTime(): Provider<String> {
 }
 
 private fun Project.git(vararg command: String, default: Provider<String>): Provider<Pair<String, Boolean>> {
-    val workTree = rootProject.layout.projectDirectory
+    val workTree = layout.settingsDirectory
     return providers.of(GitValueSource::class.java) {
         parameters.command.set(listOf("git", *command))
         parameters.workTree.set(workTree)