diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 7606740c5..0e742b94c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -3,7 +3,7 @@ on: [ push, pull_request ]
 jobs:
   test:
     runs-on: ubuntu-latest
-    container: eclipse-temurin:17-jdk
+    container: eclipse-temurin:21-jdk
     steps:
       - name: Get the version
         id: get_version
diff --git a/Dockerfile b/Dockerfile
index e36a95794..b8e87daa4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM eclipse-temurin:17-jdk-alpine as builder
+FROM eclipse-temurin:21-jdk-alpine as builder
 WORKDIR /application
 ARG JAR_FILE=build/libs/faf-java-api-*.jar
 COPY ${JAR_FILE} application.jar
 RUN java -Djarmode=layertools -jar application.jar extract
 
-FROM eclipse-temurin:17-jdk-alpine
+FROM eclipse-temurin:21-jdk-alpine
 VOLUME /tmp
 WORKDIR /application
 COPY --from=builder /application/dependencies/ ./
diff --git a/build.gradle b/build.gradle
index f4e456726..b5246dce7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,94 +13,15 @@ plugins {
   id "java"
   id "org.springframework.boot" version "3.1.5"
   id "idea"
-}
-
-// source: https://github.com/mendhak/Gradle-Travis-Colored-Output/blob/master/ColoredOutput.gradle
-tasks.withType(Test) {
-
-  boolean TRAVIS_FOLDING = project.hasProperty('TRAVIS_FOLDING') ? project.TRAVIS_FOLDING : false
-  String ANSI_BOLD_WHITE = "\u001B[0;1m";
-  String ANSI_RESET = "\u001B[0m";
-  String ANSI_BLACK = "\u001B[30m";
-  String ANSI_RED = "\u001B[31m";
-  String ANSI_GREEN = "\u001B[32m";
-  String ANSI_YELLOW = "\u001B[33m";
-  String ANSI_BLUE = "\u001B[34m";
-  String ANSI_PURPLE = "\u001B[35m";
-  String ANSI_CYAN = "\u001B[36m";
-  String ANSI_WHITE = "\u001B[37m";
-  String CHECK_MARK = "\u2713";
-  String NEUTRAL_FACE = "\u0CA0_\u0CA0";
-  String X_MARK = "\u274C";
-
-  beforeSuite { suite ->
-    if (suite.name.startsWith("Test Run") || suite.name.startsWith("Gradle Worker")) return
-
-    if (suite.parent != null && suite.className != null) {
-      if (TRAVIS_FOLDING) {
-        out.println("travis_fold:start:" + suite.name + "\r");
-      }
-      out.println(ANSI_BOLD_WHITE + suite.name + ANSI_RESET)
-    }
-
-  }
-  afterTest { descriptor, result ->
-    String indent = '    '
-    def indicator = ANSI_WHITE
-
-    if (result.failedTestCount > 0) indicator = ANSI_RED + X_MARK
-    else if (result.skippedTestCount > 0) indicator = ANSI_YELLOW + NEUTRAL_FACE
-    else indicator = ANSI_GREEN + CHECK_MARK
-
-    out.println(indent + indicator + ANSI_RESET + " " + descriptor.name);
-
-    if (result.failedTestCount > 0) {
-      String exceptions = result.getException().toString()
-      out.println(indent + exceptions.split("\\n").join("\n" + indent))
-    }
-  }
-
-  afterSuite { desc, result ->
-    if (desc.parent != null && desc.className != null) {
-
-      if (TRAVIS_FOLDING && result.failedTestCount == 0) {
-        out.println("travis_fold:end:" + desc.name + "\r");
-      }
-      out.println("")
-    }
-
-
-    if (!desc.parent) { // will match the outermost suite
-      def failStyle = ANSI_RED
-      def skipStyle = ANSI_YELLOW
-      def summaryStyle = ANSI_WHITE
-
-      switch (result.resultType) {
-        case TestResult.ResultType.SUCCESS:
-          summaryStyle = ANSI_GREEN;
-          break;
-        case TestResult.ResultType.FAILURE:
-          summaryStyle = ANSI_RED;
-          break;
-      }
-
-      out.println("--------------------------------------------------------------------------");
-      out.println("Results: " + summaryStyle + "${result.resultType}" + ANSI_RESET
-        + " (${result.testCount} tests, "
-        + ANSI_GREEN + "${result.successfulTestCount} passed" + ANSI_RESET
-        + ", " + failStyle + "${result.failedTestCount} failed" + ANSI_RESET
-        + ", " + skipStyle + "${result.skippedTestCount} skipped" + ANSI_RESET
-        + ")");
-      out.println("--------------------------------------------------------------------------");
-    }
-  }
-
+  id "com.adarshr.test-logger" version "4.0.0"
 }
 
 group = 'faforever'
 
-sourceCompatibility = 17
-targetCompatibility = 17
+java {
+  sourceCompatibility = JavaVersion.VERSION_21
+  targetCompatibility = JavaVersion.VERSION_21
+}
 
 bootJar.enabled = true
 jar.enabled = false
@@ -171,6 +92,7 @@ processInttestResources {
 apply plugin: 'jacoco'
 apply plugin: 'com.github.kt3k.coveralls'
 jacocoTestReport {
+  dependsOn inttest
   executionData.from = files(["$buildDir/jacoco/test.exec", "$buildDir/jacoco/inttest.exec"])
   reports {
     xml.required = true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa..7f93135c4 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f398c33c4..3fa8f862f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d6..1aa94a426 100755
--- a/gradlew
+++ b/gradlew
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# 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"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,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
@@ -152,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
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# 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.
+
+# 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, 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" \