diff --git a/build.gradle b/build.gradle
index c368cdf146..69cfd30339 100644
--- a/build.gradle
+++ b/build.gradle
@@ -94,7 +94,7 @@ subprojects {
 
     configurations.all {
         // Force spotless depending on newer version of guava due to CVE-2023-2976. Remove after spotless upgrades.
-        resolutionStrategy.force "com.google.guava:guava:32.1.3-jre"
+        resolutionStrategy.force "com.google.guava:guava:33.4.5-jre"
         resolutionStrategy.force 'org.apache.commons:commons-compress:1.26.0'
         resolutionStrategy.force "io.netty:netty-buffer:${versions.netty}"
         resolutionStrategy.force "io.netty:netty-codec:${versions.netty}"
diff --git a/common/build.gradle b/common/build.gradle
index 5cbf100289..93d9736447 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -86,8 +86,11 @@ shadowJar {
     destinationDirectory = file("${project.buildDir}/distributions")
     archiveClassifier.set(null)
     exclude 'META-INF/maven/com.google.guava/**'
-    exclude 'com/google/thirdparty/**'
-    relocate 'com.google.common', 'org.opensearch.ml.repackage.com.google.common' // dependency of cron-utils
+
+    exclude 'org/jspecify/**'
+    // Relocate Guava to avoid conflicts with other plugins
+    relocate 'com.google.common', 'org.opensearch.ml.repackage.com.google.common'
+    relocate 'com.google.thirdparty', 'org.opensearch.ml.repackage.com.google.thirdparty'
 }
 
 jar {