diff --git a/build.gradle b/build.gradle
index 0ac56b1389245..cc13761453c41 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,6 +55,7 @@ plugins {
   id 'opensearch.docker-support'
   id 'opensearch.global-build-info'
   id "com.diffplug.spotless" version "6.25.0" apply false
+  id "org.gradle.test-retry" version "1.6.2" apply false
   id "test-report-aggregation"
   id 'jacoco-report-aggregation'
 }
@@ -70,13 +71,6 @@ apply from: 'gradle/run.gradle'
 apply from: 'gradle/missing-javadoc.gradle'
 apply from: 'gradle/code-coverage.gradle'
 
-// Disable unconditional publishing of build scans
-develocity {
-  buildScan {
-    publishing.onlyIf { false }
-  }
-}
-
 // common maven publishing configuration
 allprojects {
   group = 'org.opensearch'
@@ -475,8 +469,9 @@ gradle.projectsEvaluated {
 
 // test retry configuration
 subprojects {
+  apply plugin: "org.gradle.test-retry"
   tasks.withType(Test).configureEach {
-    develocity.testRetry {
+    retry {
       if (BuildParams.isCi()) {
         maxRetries = 3
         maxFailures = 10
diff --git a/gradle.properties b/gradle.properties
index d4634f1a7aeea..47c3efdfbd2a0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,9 +21,6 @@ org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Xss2m \
     --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 options.forkOptions.memoryMaximumSize=3g
 
-# Disable Gradle Enterprise Gradle plugin's test retry
-systemProp.develocity.testretry.enabled.enabled=false
-
 # Disable duplicate project id detection
 # See https://docs.gradle.org/current/userguide/upgrading_version_6.html#duplicate_project_names_may_cause_publication_to_fail
 systemProp.org.gradle.dependency.duplicate.project.detection=false
diff --git a/settings.gradle b/settings.gradle
index c58d32830170a..2ce31d1a3d766 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,10 +9,6 @@
  * GitHub history for details.
  */
 
-plugins {
-  id "com.gradle.develocity" version "3.19.1"
-}
-
 ext.disableBuildCache = hasProperty('DISABLE_BUILD_CACHE') || System.getenv().containsKey('DISABLE_BUILD_CACHE')
 
 buildCache {