diff --git a/account/build.gradle b/account/build.gradle
index 229ecc7c8f..dead7b8468 100644
--- a/account/build.gradle
+++ b/account/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     implementation project(':network')
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
 }
 test {
     useJUnitPlatform()
diff --git a/application/build.gradle b/application/build.gradle
index 54abcf1949..7c61ce32e3 100644
--- a/application/build.gradle
+++ b/application/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     implementation project(':wallets')
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
     implementation 'com.typesafe:config'
 }
 
diff --git a/common/build.gradle b/common/build.gradle
index e96ddbdb93..3248e52ef5 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     api platform(project(':platforms:common-platform'))
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
     implementation 'com.typesafe:config'
     implementation 'org.jetbrains:annotations:23.0.0'
 }
diff --git a/contract/build.gradle b/contract/build.gradle
index 5e9eaca3fd..ced9330a38 100644
--- a/contract/build.gradle
+++ b/contract/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     implementation project(':network')
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
 }
 
 test {
diff --git a/desktop/build.gradle b/desktop/build.gradle
index ec3a9a0253..4a18eab0ca 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -71,7 +71,7 @@ dependencies {
     implementation project(':wallets')
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
 
     implementation 'com.jfoenix:jfoenix:9.0.10'
     implementation 'de.jensd:fontawesomefx:8.0.0'
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e5213a3d88..3da97ef93c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,10 +1,12 @@
 # Version Catalogs documentation: https://docs.gradle.org/7.4.1/userguide/platforms.html
 
 [versions]
+guava = '31.1-jre'
 i2p = '1.7.0'
 protobuf = '0.8.18'
 
 [libraries]
+guava = { module = 'com.google.guava:guava', version.ref = 'guava'}
 i2p-streaming = { module = 'net.i2p.client:streaming', version.ref = 'i2p' }
 i2p-core = { module = 'net.i2p:i2p', version.ref = 'i2p' }
 i2p-router = { module = 'net.i2p:router', version.ref = 'i2p' }
diff --git a/grpc/build.gradle b/grpc/build.gradle
index e7c2df50d1..49b3792819 100644
--- a/grpc/build.gradle
+++ b/grpc/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     implementation 'io.grpc:grpc-services'
     implementation 'io.grpc:grpc-stub'
     implementation 'org.codehaus.mojo:animal-sniffer-annotations'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
 }
 
 ext {
diff --git a/i18n/build.gradle b/i18n/build.gradle
index 845adf3194..7f92f412e5 100644
--- a/i18n/build.gradle
+++ b/i18n/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     api platform(project(':platforms:common-platform'))
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
 }
 
 test {
diff --git a/i2p/build.gradle b/i2p/build.gradle
index 95dd13120a..866d07518c 100644
--- a/i2p/build.gradle
+++ b/i2p/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     implementation project(':common')
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
 
     // Exclude httpclient transitive dependency because it may override
     // I2P-specific impl of some Apache classes like org.apache.http.util.Args
diff --git a/identity/build.gradle b/identity/build.gradle
index 6efbf373d3..911d0a9084 100644
--- a/identity/build.gradle
+++ b/identity/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     implementation project(':network')
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
     implementation 'com.typesafe:config'
 }
 test {
diff --git a/network/build.gradle b/network/build.gradle
index 1ad219217b..623e36942d 100644
--- a/network/build.gradle
+++ b/network/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     implementation project(':persistence')
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
     implementation 'com.typesafe:config'
     implementation 'com.google.protobuf:protobuf-java'
 
diff --git a/offer/build.gradle b/offer/build.gradle
index 6d9411a9c6..9c119e314b 100644
--- a/offer/build.gradle
+++ b/offer/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     implementation project(':wallets')
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
     implementation 'com.google.code.gson:gson'
     implementation 'com.github.chimp1984:jsocks'
 }
diff --git a/oracle/build.gradle b/oracle/build.gradle
index 70ac0804e0..2f744bf385 100644
--- a/oracle/build.gradle
+++ b/oracle/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     implementation project(':network')
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
     implementation 'com.google.code.gson:gson'
 }
 
diff --git a/persistence/build.gradle b/persistence/build.gradle
index af23b23e2b..4e3645322c 100644
--- a/persistence/build.gradle
+++ b/persistence/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     implementation project(':common')
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
 }
 
 test {
diff --git a/platforms/common-platform/build.gradle b/platforms/common-platform/build.gradle
index 0a16eba8f7..4dd36f9357 100644
--- a/platforms/common-platform/build.gradle
+++ b/platforms/common-platform/build.gradle
@@ -32,6 +32,7 @@ dependencies {
         /////////////////////////////////////////////////////////////////////////////////
         // Guava and transitive dependency constraints
         /////////////////////////////////////////////////////////////////////////////////
+        // TODO Version constraint currently not checked?
         api('com.google.guava:guava') {
             version { require '30.1.1-jre' }
         }
diff --git a/presentation/build.gradle b/presentation/build.gradle
index d609e43d64..c1dbcc4b07 100644
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     implementation project(':offer')
     implementation project(':oracle')
 
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
 }
 
 test {
diff --git a/protocol/build.gradle b/protocol/build.gradle
index 07eca1a2dd..6f6808263b 100644
--- a/protocol/build.gradle
+++ b/protocol/build.gradle
@@ -28,7 +28,7 @@ apply from: '../buildSrc/lombok-dependencies.gradle'
     implementation project(':wallets')
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
     implementation 'com.typesafe:config'
 
     implementation("org.jeasy:easy-states:2.0.0")
diff --git a/security/build.gradle b/security/build.gradle
index a7326dd53c..7e95140f56 100644
--- a/security/build.gradle
+++ b/security/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     implementation project(':persistence')
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
     implementation 'org.bouncycastle:bcprov-jdk16:1.46'
 }
 test {
diff --git a/seed/build.gradle b/seed/build.gradle
index 39f157b1d6..c2438b132c 100644
--- a/seed/build.gradle
+++ b/seed/build.gradle
@@ -29,7 +29,7 @@ dependencies {
 
     implementation project(':application')
 
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
     implementation 'com.typesafe:config'
 }
 test {
diff --git a/settings/build.gradle b/settings/build.gradle
index 924995c3b9..af01046f1d 100644
--- a/settings/build.gradle
+++ b/settings/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     implementation project(':persistence')
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
 }
 test {
     useJUnitPlatform()
diff --git a/social/build.gradle b/social/build.gradle
index a808b1d18d..163874bed7 100644
--- a/social/build.gradle
+++ b/social/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     implementation 'com.github.chimp1984:jsocks'
     implementation "com.google.code.gson:gson:2.8.5"
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
     implementation 'com.typesafe:config'
 }
 
diff --git a/support/build.gradle b/support/build.gradle
index ff39834a31..5eb2421a44 100644
--- a/support/build.gradle
+++ b/support/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     implementation project(':network')
 
     implementation 'com.google.protobuf:protobuf-java'
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
 }
 test {
     useJUnitPlatform()
diff --git a/tools/build.gradle b/tools/build.gradle
index 38397f6624..42e834270f 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     implementation project(':application')
     implementation project(':desktop')
 
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
     implementation 'com.typesafe:config'
 
     implementation 'com.jfoenix:jfoenix:9.0.10'
diff --git a/tor/build.gradle b/tor/build.gradle
index de71335693..49b55f9f86 100644
--- a/tor/build.gradle
+++ b/tor/build.gradle
@@ -18,7 +18,7 @@ dependencies {
 
     implementation project(':common')
 
-    implementation 'com.google.guava:guava'
+    implementation libs.guava
 
     implementation 'org.apache.commons:commons-compress'
 
diff --git a/wallets/build.gradle b/wallets/build.gradle
index c3282063ae..0d5667d829 100644
--- a/wallets/build.gradle
+++ b/wallets/build.gradle
@@ -14,7 +14,6 @@ apply from: '../buildSrc/test-dependencies.gradle'
 apply from: '../buildSrc/lombok-dependencies.gradle'
 
 ext {
-    guavaVersion = '31.0.1-jre'
     jsonrpc4jVersion = '1.6.0.bisq.2'
     jacksonDatabindVersion = '2.12.0'
 }
@@ -29,7 +28,7 @@ dependencies {
         exclude(module: 'base64')
         exclude(module: 'httpcore-nio')
     }
-    implementation("com.google.guava:guava:$guavaVersion")
+    implementation libs.guava
 
     testImplementation("org.assertj:assertj-core:3.22.0")
 }