diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle
index e884379..2d244c6 100644
--- a/gradle/test/junit5.gradle
+++ b/gradle/test/junit5.gradle
@@ -1,8 +1,8 @@
 dependencies {
-    testImplementation libs.junit.jupiter.api
-    testImplementation libs.hamcrest
-    testRuntimeOnly libs.junit.jupiter.engine
-    testRuntimeOnly libs.junit.jupiter.platform.launcher
+    testImplementation testLibs.junit.jupiter.api
+    testImplementation testLibs.hamcrest
+    testRuntimeOnly testLibs.junit.jupiter.engine
+    testRuntimeOnly testLibs.junit.jupiter.platform.launcher
 }
 
 test {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e30733a..8838ba9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index 380d347..a057d4b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,17 +15,19 @@ pluginManagement {
 dependencyResolutionManagement {
     versionCatalogs {
         libs {
-            version('gradle', '8.4-rc-1')
+            version('gradle', '8.4')
+            library('bouncycastle', 'org.bouncycastle', 'bcpkix-jdk18on').version('1.76')
+            library('jackson', 'com.fasterxml.jackson.core', 'jackson-databind').version('2.15.2')
+            library('jna', 'net.java.dev.jna', 'jna').version('5.13.0')
+            library('datastructures-common', 'org.xbib', 'datastructures-common').version('5.0.5')
+        }
+        testLibs {
             version('junit', '5.10.0')
             library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
             library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')
             library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
             library('junit-jupiter-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').version('1.10.0')
             library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
-            library('bouncycastle', 'org.bouncycastle', 'bcpkix-jdk18on').version('1.76')
-            library('jackson', 'com.fasterxml.jackson.core', 'jackson-databind').version('2.15.2')
-            library('jna', 'net.java.dev.jna', 'jna').version('5.13.0')
-            library('datastructures-common', 'org.xbib', 'datastructures-common').version('3.0.0')
         }
     }
 }