diff --git a/gradle/gradle-develocity.gradle b/gradle/gradle-develocity.gradle
index 18279c3e44e7..0a9e8c98e128 100644
--- a/gradle/gradle-develocity.gradle
+++ b/gradle/gradle-develocity.gradle
@@ -11,8 +11,8 @@
 
 ext {
     isCiEnvironment = isJenkins() || isGitHubActions() || isGenericCi()
-    populateRemoteBuildCache = isEnabled( "POPULATE_REMOTE_GRADLE_CACHE" )
-    useRemoteCache = !isEnabled( "DISABLE_REMOTE_GRADLE_CACHE" )
+    populateRemoteBuildCache = getSetting('POPULATE_REMOTE_GRADLE_CACHE').orElse('false').toBoolean()
+    useRemoteCache = !getSetting('DISABLE_REMOTE_GRADLE_CACHE').orElse('false').toBoolean()
 }
 
 private static boolean isJenkins() {
@@ -37,14 +37,6 @@ static java.util.Optional<String> getSetting(String name) {
     return java.util.Optional.ofNullable(sysProp);
 }
 
-static boolean isEnabled(String setting) {
-	if ( System.getenv().hasProperty( setting ) ) {
-		return true
-	}
-
-	return System.hasProperty( setting )
-}
-
 develocity {
     server = 'https://develocity.commonhaus.dev'