diff --git a/build.gradle b/build.gradle
index 567dfe95..a19be109 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,9 @@ subprojects {
 
     ext {
         grpcVersion = '1.83.1'
+        //Keep at or above gRPC's guava version.
+        guavaVersion = '33.6.0-jre'
+
         jupiterVersion = '5.13.4'
         mockitoVersion = '4.11.0'
         nimbusVersion = '10.9.1'
@@ -86,7 +89,6 @@ subprojects {
 
     dependencies {
         implementation "org.apache.commons:commons-lang3:3.20.0"
-        implementation "commons-validator:commons-validator:1.11.0"
 
         testImplementation "org.junit.jupiter:junit-jupiter-api:${jupiterVersion}"
         testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${jupiterVersion}"
@@ -135,7 +137,7 @@ tasks.register('jacocoTestReport', JacocoReport) {
     }
 
     def mainSourceDirs = files(subprojects.collect { p -> p.sourceSets.main.allSource.srcDirs })
-    def mainClassDirs  = files(subprojects.collect { p -> p.sourceSets.main.output })
+    def mainClassDirs = files(subprojects.collect { p -> p.sourceSets.main.output })
 
     sourceDirectories = mainSourceDirs
 
diff --git a/java-spiffe-core/build.gradle b/java-spiffe-core/build.gradle
index d1c337a2..77abe63f 100644
--- a/java-spiffe-core/build.gradle
+++ b/java-spiffe-core/build.gradle
@@ -78,6 +78,7 @@ dependencies {
 
     compileOnly "org.apache.tomcat:annotations-api:6.0.53"
 
+    implementation "com.google.guava:guava:${guavaVersion}"
     implementation "com.nimbusds:nimbus-jose-jwt:${nimbusVersion}"
     testFixturesImplementation "com.nimbusds:nimbus-jose-jwt:${nimbusVersion}"
 
diff --git a/java-spiffe-core/src/main/java/io/spiffe/workloadapi/Address.java b/java-spiffe-core/src/main/java/io/spiffe/workloadapi/Address.java
index 920cfe10..a76a244d 100644
--- a/java-spiffe-core/src/main/java/io/spiffe/workloadapi/Address.java
+++ b/java-spiffe-core/src/main/java/io/spiffe/workloadapi/Address.java
@@ -1,8 +1,8 @@
 package io.spiffe.workloadapi;
 
+import com.google.common.net.InetAddresses;
 import io.spiffe.exception.SocketEndpointAddressException;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.validator.routines.InetAddressValidator;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -158,7 +158,7 @@ private static void validateTcpAddress(final URI parsedAddress) throws SocketEnd
         }
 
         boolean ipValid;
-        ipValid = InetAddressValidator.getInstance().isValid(parsedAddress.getHost());
+        ipValid = InetAddresses.isInetAddress(parsedAddress.getHost());
         if (!ipValid) {
             String error = "Workload endpoint tcp socket URI host component must be an IP:port: %s";
             throw new SocketEndpointAddressException(String.format(error, parsedAddress));