diff --git a/.github/trigger_files/beam_PostCommit_XVR_Flink.json b/.github/trigger_files/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.json
similarity index 100%
rename from .github/trigger_files/beam_PostCommit_XVR_Flink.json
rename to .github/trigger_files/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.json
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2906095db9ed..8df07d29f67a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -62,8 +62,9 @@ buildCache {
       username = System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME")
       password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
     }
-    isEnabled = !System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME").isNullOrBlank()
-    isPush = isCi
+    // TODO(yathu) re-enable when remote gradle cache cleaned up
+    isEnabled = false // !System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME").isNullOrBlank()
+    isPush = false
   }
 }