diff --git a/build.gradle b/build.gradle
index 54d2d77f57..65510e9d81 100644
--- a/build.gradle
+++ b/build.gradle
@@ -148,10 +148,10 @@ allprojects {
                 libs.byteBuddy,
                 libs.byteBuddy.agent,
                 // patching conflicting Checkstyle dependencies
-                "org.codehaus.plexus:plexus-utils:3.3.0",
-                "org.apache.commons:commons-lang3:3.8.1",
-                "org.apache.httpcomponents:httpcore:4.4.14",
-                "commons-codec:commons-codec:1.15"
+                libs.commons.codec,
+                libs.commons.lang3,
+                libs.httpcore,
+                libs.plexus.utils
         }
     }
 
@@ -168,7 +168,7 @@ subprojects {
     dependencies {
         testImplementation libs.hamcrest
         testImplementation libs.mockito
-        testImplementation platform("org.junit:junit-bom:${libs.versions.junit.get()}")
+        testImplementation platform(libs.junit.bom)
         testImplementation "org.junit.jupiter:junit-jupiter-params"
         testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
         testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
@@ -1226,7 +1226,7 @@ project(':aeron-test-support') {
         implementation project(':aeron-client')
         implementation project(':aeron-cluster')
         implementation project(':aeron-samples')
-        implementation platform("org.junit:junit-bom:${libs.versions.junit.get()}")
+        implementation platform(libs.junit.bom)
         implementation "org.junit.jupiter:junit-jupiter-api"
         implementation "org.junit.jupiter:junit-jupiter-params"
         implementation libs.mockito
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 13f126728a..4bf077fb08 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,29 +1,48 @@
 [versions]
 agrona = "2.0.1"
+asciidoctorj = "2.5.13"
 asm = "9.7.1"
+bnd = "7.1.0"
 byteBuddy = "1.16.1"
 checkstyle = "10.21.1"
-junit = "5.11.4"
+commons-codec = "1.15"
+commons-lang3 = "3.8.1"
+findbugs = "3.0.1"
 gradle = "8.11.1"
+hamcrest = "3.0"
+hdrHistogram = "2.2.2"
+httpcore = "4.4.14"
+jgit = "6.10.0.202406032230-r"
+junit = "5.11.4"
+mockito = "5.15.2"
+plexus = "3.3.0"
+sbe = "1.34.1"
+shadow = "8.3.5"
+versions = "0.51.0"
 
 [libraries]
 agrona = { group = "org.agrona", name = "agrona", version.ref = "agrona" }
-sbe = { group = "uk.co.real-logic", name = "sbe-tool", version = "1.34.1" }
-mockito = { group = "org.mockito", name = "mockito-core", version = "5.15.2" }
-hamcrest = { group = "org.hamcrest", name = "hamcrest", version = "3.0" }
-findbugs = { group = "com.google.code.findbugs", name = "findbugs-annotations", version = "3.0.1" }
-byteBuddy = { group = "net.bytebuddy", name = "byte-buddy", version.ref = "byteBuddy" }
-byteBuddy-agent = { group = "net.bytebuddy", name = "byte-buddy-agent", version.ref = "byteBuddy" }
-hdrHistogram = { group = "org.hdrhistogram", name = "HdrHistogram", version = "2.2.2" }
-asciidoctorj = { group = "org.asciidoctor", name = "asciidoctorj", version = "2.5.13" }
-jgit = { group = "org.eclipse.jgit", name = "org.eclipse.jgit", version = "6.10.0.202406032230-r" }
+asciidoctorj = { group = "org.asciidoctor", name = "asciidoctorj", version.ref = "asciidoctorj" }
 asm = { group = "org.ow2.asm", name = "asm", version.ref = "asm" }
 asm-analysis = { group = "org.ow2.asm", name = "asm-analysis", version.ref = "asm" }
 asm-commons = { group = "org.ow2.asm", name = "asm-commons", version.ref = "asm" }
 asm-tree = { group = "org.ow2.asm", name = "asm-tree", version.ref = "asm" }
 asm-util = { group = "org.ow2.asm", name = "asm-util", version.ref = "asm" }
+byteBuddy = { group = "net.bytebuddy", name = "byte-buddy", version.ref = "byteBuddy" }
+byteBuddy-agent = { group = "net.bytebuddy", name = "byte-buddy-agent", version.ref = "byteBuddy" }
+commons-codec = { group = "commons-codec", name = "commons-codec", version.ref = "commons-codec" }
+commons-lang3 = { group = "org.apache.commons", name = "commons-lang3", version.ref = "commons-lang3" }
+findbugs = { group = "com.google.code.findbugs", name = "findbugs-annotations", version.ref= "findbugs" }
+hamcrest = { group = "org.hamcrest", name = "hamcrest", version.ref = "hamcrest" }
+hdrHistogram = { group = "org.hdrhistogram", name = "HdrHistogram", version.ref = "hdrHistogram" }
+httpcore = { group = "org.apache.httpcomponents", name = "httpcore", version.ref = "httpcore" }
+jgit = { group = "org.eclipse.jgit", name = "org.eclipse.jgit", version.ref = "jgit" }
+junit-bom = { group = "org.junit", name = "junit-bom", version.ref = "junit" }
+mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
+plexus-utils = { group = "org.codehaus.plexus", name = "plexus-utils", version.ref = "plexus" }
+sbe = { group = "uk.co.real-logic", name = "sbe-tool", version.ref = "sbe" }
 
 [plugins]
-versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
-bnd = { id = "biz.aQute.bnd.builder", version = "7.1.0" }
-shadow = { id = "com.gradleup.shadow", version = "8.3.5" }
+bnd = { id = "biz.aQute.bnd.builder", version.ref = "bnd" }
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
+versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }