diff --git a/build.gradle b/build.gradle
index 4be3ce4e53cd0..9003e2dc91064 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,7 +48,7 @@ plugins {
   id 'lifecycle-base'
   id 'opensearch.docker-support'
   id 'opensearch.global-build-info'
-  id "com.diffplug.spotless" version "5.6.1" apply false
+  id "com.diffplug.spotless" version "6.9.0" apply false
 }
 
 apply from: 'gradle/build-complete.gradle'
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/testclusters/StandaloneRestIntegTestTask.java b/buildSrc/src/main/java/org/opensearch/gradle/testclusters/StandaloneRestIntegTestTask.java
index 63090f9402cdd..bf17daa6e2e6f 100644
--- a/buildSrc/src/main/java/org/opensearch/gradle/testclusters/StandaloneRestIntegTestTask.java
+++ b/buildSrc/src/main/java/org/opensearch/gradle/testclusters/StandaloneRestIntegTestTask.java
@@ -31,6 +31,7 @@
 
 package org.opensearch.gradle.testclusters;
 
+import groovy.lang.Closure;
 import org.opensearch.gradle.FileSystemOperationsAware;
 import org.opensearch.gradle.test.Fixture;
 import org.opensearch.gradle.util.GradleUtils;
@@ -60,6 +61,7 @@
 public class StandaloneRestIntegTestTask extends Test implements TestClustersAware, FileSystemOperationsAware {
 
     private Collection<OpenSearchCluster> clusters = new HashSet<>();
+    private Closure<Void> beforeStart;
 
     public StandaloneRestIntegTestTask() {
         this.getOutputs()
@@ -86,6 +88,18 @@ public StandaloneRestIntegTestTask() {
             );
     }
 
+    // Hook for executing any custom logic before starting the task.
+    public void setBeforeStart(Closure<Void> closure) {
+        beforeStart = closure;
+    }
+
+    @Override
+    public void beforeStart() {
+        if (beforeStart != null) {
+            beforeStart.call(this);
+        }
+    }
+
     @Override
     public int getMaxParallelForks() {
         return 1;