diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index 25bbac9e8c2..02e820ea402 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -8,3 +8,7 @@ cacheRedirectorEnabled=true
 #buildSrc.kotlin.version=1.1.50
 
 kotlin.build.gradlePlugin.version=0.0.38
+
+# Please keep it in sync with root gradle.properties.
+# It's currently needed for proper configuration cache work, the reason will be investigated later
+org.gradle.java.installations.fromEnv=JDK_16,JDK_17,JDK_18,JDK_9,JDK_10,JDK_11,JDK_15,JDK_16_0,JDK_17_0
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 6d6592528e0..97accb5fbf5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,6 +3,9 @@ kotlin.daemon.jvmargs=-Xmx2200m
 
 org.gradle.parallel=true
 org.gradle.caching=true
+
+# Please keep it in sync with buildSrc gradle.properties.
+# It's currently needed for proper configuration cache work, the reason will be investigated later
 org.gradle.java.installations.fromEnv=JDK_16,JDK_17,JDK_18,JDK_9,JDK_10,JDK_11,JDK_15,JDK_16_0,JDK_17_0
 
 systemProp.org.gradle.internal.http.connectionTimeout=90000