diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8c85adbb..73c42e1d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 19
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 34e4cb79..e9777a60 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 19
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
diff --git a/build.gradle b/build.gradle
index ebce2c9b..c4aad8dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.1.5'
-    id 'io.spring.dependency-management' version '1.1.3'
-    id 'com.github.ben-manes.versions' version '0.49.0'
+    id 'org.springframework.boot' version '3.2.0'
+    id 'io.spring.dependency-management' version '1.1.4'
+    id 'com.github.ben-manes.versions' version '0.50.0'
     id 'jacoco'
     id "org.sonarqube" version '4.4.1.3373'
 }
@@ -10,7 +10,7 @@ plugins {
 def homeFrontendVersion = '1.15.0'
 
 jacoco {
-    toolVersion = '0.8.8'
+    toolVersion = '0.8.11'
 }
 
 jacocoTestReport {
@@ -45,7 +45,7 @@ repositories {
 
 java {
     toolchain{
-        languageVersion = JavaLanguageVersion.of(19)
+        languageVersion = JavaLanguageVersion.of(21)
     }
 }
 
@@ -90,14 +90,14 @@ dependencies {
     implementation('org.ehcache:ehcache:3.10.8')
     implementation('commons-io:commons-io:2.15.0')
     implementation('org.apache.commons:commons-collections4:4.4')
-    implementation('org.apache.commons:commons-lang3:3.13.0')
+    implementation('org.apache.commons:commons-lang3:3.14.0')
     implementation('org.apache.commons:commons-math3:3.6.1')
     implementation('javax.inject:javax.inject:1')
     implementation('com.google.code.findbugs:jsr305:3.0.2')
 
     testImplementation('org.springframework.boot:spring-boot-starter-test')
     testImplementation('org.springframework.security:spring-security-test')
-    testImplementation('nl.jqno.equalsverifier:equalsverifier:3.15.2')
+    testImplementation('nl.jqno.equalsverifier:equalsverifier:3.15.3')
     testImplementation('org.awaitility:awaitility:4.2.0')
     testImplementation('com.squareup.okhttp3:okhttp:4.12.0')
     testImplementation('com.squareup.okhttp3:mockwebserver:4.12.0')
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3fa8f862..9aaaf603 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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-rc-3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 0adc8e1a..1aa94a42 100755
--- a/gradlew
+++ b/gradlew
@@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/src/main/java/nl/homeserver/energy/mindergasnl/MindergasnlService.java b/src/main/java/nl/homeserver/energy/mindergasnl/MindergasnlService.java
index c27cedc0..cf2e9023 100644
--- a/src/main/java/nl/homeserver/energy/mindergasnl/MindergasnlService.java
+++ b/src/main/java/nl/homeserver/energy/mindergasnl/MindergasnlService.java
@@ -62,7 +62,7 @@ public void uploadMostRecentMeterstand(final MindergasnlSettings settings) {
 
     private void upload(final MindergasnlSettings settings, final LocalDate day, final BigDecimal gasReading) {
         final WebClient client = WebClient.builder().baseUrl(mindergasNlApiUrl).build();
-        final HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(client)).build();
+        final HttpServiceProxyFactory factory = HttpServiceProxyFactory.builderFor(WebClientAdapter.create(client)).build();
         final MinderGasnlApi api = factory.createClient(MinderGasnlApi.class);
 
         HttpStatusCode httpStatusCode;