diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 32934ed31ff..6806da6a13f 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
   implementation("org.eclipse.aether", "aether-transport-http", "1.1.0")
   implementation("org.apache.maven", "maven-aether-provider", "3.3.9")
 
-  implementation("com.google.guava", "guava", "20.0")
+  implementation("com.google.guava", "guava", "30.0-android")
   implementation("org.ow2.asm", "asm", "9.0")
   implementation("org.ow2.asm", "asm-tree", "9.0")
 
diff --git a/dd-java-agent/appsec/weblog/weblog-common/weblog-common.gradle b/dd-java-agent/appsec/weblog/weblog-common/weblog-common.gradle
index 0d1451db613..7278e480161 100644
--- a/dd-java-agent/appsec/weblog/weblog-common/weblog-common.gradle
+++ b/dd-java-agent/appsec/weblog/weblog-common/weblog-common.gradle
@@ -5,5 +5,5 @@ targetCompatibility = 1.6
 
 dependencies {
   api 'javax.servlet:servlet-api:2.4'
-  implementation group: 'com.google.guava', name: 'guava', version: '20.0'
+  implementation group: 'com.google.guava', name: 'guava', version: '30.0-android'
 }
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3/datastax-cassandra-3.gradle b/dd-java-agent/instrumentation/datastax-cassandra-3/datastax-cassandra-3.gradle
index 4092f3af3d2..f208611e1e4 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra-3/datastax-cassandra-3.gradle
+++ b/dd-java-agent/instrumentation/datastax-cassandra-3/datastax-cassandra-3.gradle
@@ -20,7 +20,7 @@ muzzle {
     // end up with testing compatibility with guava 0.16 which lacks the method invocation added to be compatible with
     // most recent versions of guava (27+). While the long term solution is to make the muzzle plugin aware of upstream
     // declared dependencies, for now we just make sure that we use the proper ones.
-    extraDependency "com.google.guava:guava:20.0"
+    extraDependency "com.google.guava:guava:30.0-android"
   }
 
   // Making sure that instrumentation works with recent versions of Guava which removed method
@@ -47,7 +47,7 @@ testSets {
 
 dependencies {
   compileOnly group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.0.0'
-  compileOnly group: 'com.google.guava', name: 'guava', version: '18.0'
+  compileOnly group: 'com.google.guava', name: 'guava', version: '30.0-android'
 
   testImplementation group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
   testImplementation group: 'org.cassandraunit', name: 'cassandra-unit', version: '3.1.3.2'
diff --git a/dd-java-agent/instrumentation/guava-10/guava-10.gradle b/dd-java-agent/instrumentation/guava-10/guava-10.gradle
index d094275c23b..d799685ad02 100644
--- a/dd-java-agent/instrumentation/guava-10/guava-10.gradle
+++ b/dd-java-agent/instrumentation/guava-10/guava-10.gradle
@@ -17,9 +17,9 @@ testSets {
 }
 
 dependencies {
-  compileOnly group: 'com.google.guava', name: 'guava', version: '10.0'
+  compileOnly group: 'com.google.guava', name: 'guava', version: '30.0-android'
 
-  testImplementation group: 'com.google.guava', name: 'guava', version: '16.0'
+  testImplementation group: 'com.google.guava', name: 'guava', version: '30.0-android'
   // ^ first version with com.google.common.reflect.ClassPath.getAllClasses()
 
   latestDepTestImplementation group: 'com.google.guava', name: 'guava', version: '+'
diff --git a/dd-smoke-tests/osgi/osgi.gradle b/dd-smoke-tests/osgi/osgi.gradle
index 5f1d30a509c..3ff46bb476d 100644
--- a/dd-smoke-tests/osgi/osgi.gradle
+++ b/dd-smoke-tests/osgi/osgi.gradle
@@ -23,14 +23,14 @@ dependencies {
   compileOnly group: 'org.osgi', name: 'org.osgi.core', version: '4.2.0'
   compileOnly group: 'org.osgi', name: 'org.osgi.compendium', version: '4.2.0'
   compileOnly group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
-  compileOnly group: 'com.google.guava', name: 'guava', version: '20.0'
+  compileOnly group: 'com.google.guava', name: 'guava', version: '30.0-android'
   compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
 
   equinox 'org.eclipse.platform:org.eclipse.osgi:3.15.300'
   felix 'org.apache.felix:org.apache.felix.framework:6.0.4'
 
   bundles 'org.ops4j.pax.logging:pax-logging-api:1.11.0'
-  bundles 'com.google.guava:guava:20.0'
+  bundles 'com.google.guava:guava:30.0-android'
   bundles 'org.apache.felix:org.apache.felix.configadmin:1.9.18'
   bundles 'org.apache.httpcomponents:httpcore-osgi:4.4.14'
   bundles 'org.apache.httpcomponents:httpclient-osgi:4.5.13'