diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml
index 23204529408..0ab491cbb20 100644
--- a/.github/actions/setup-build/action.yml
+++ b/.github/actions/setup-build/action.yml
@@ -1,9 +1,16 @@
 name: Set up Build
 description: Sets up Build
+inputs:
+  java-version:
+    description: 'The Java version to set up'
+    required: true
+    default: '17'
 runs:
   using: "composite"
   steps:
     - uses: ./.github/actions/setup-java
+      with:
+        java-version: ${{ inputs.java-version }}
     - name: Clear existing docker image cache
       shell: bash
       run: docker image prune -af
diff --git a/.github/actions/setup-java/action.yml b/.github/actions/setup-java/action.yml
index 053b7ebe23b..ee8c3323fc1 100644
--- a/.github/actions/setup-java/action.yml
+++ b/.github/actions/setup-java/action.yml
@@ -1,9 +1,14 @@
 name: Set up Java
 description: Sets up Java version
+inputs:
+  java-version:
+    description: 'The Java version to set up'
+    required: true
+    default: '17'
 runs:
   using: "composite"
   steps:
     - uses: actions/setup-java@v4
       with:
-        java-version: '8'
+        java-version: ${{ inputs.java-version }}
         distribution: temurin
diff --git a/.github/settings.yml b/.github/settings.yml
index b10394a894a..cc9f477b19d 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -400,7 +400,7 @@ branches:
         # Required. Require branches to be up to date before merging.
         strict: true
         # Required. The list of status checks to require in order to merge into this branch
-        contexts: ["core", "check_docs_examples (:docs:examples:check)", "in-docker_test", "ci/circleci: minimal_core", "test"]
+        contexts: ["core (17)", "core (21)", "check_docs_examples (:docs:examples:check)", "in-docker_test", "ci/circleci: minimal_core", "test"]
       # Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
       enforce_admins: false
       # Prevent merge commits from being pushed to matching branches
diff --git a/.github/workflows/ci-docker-wormhole.yml b/.github/workflows/ci-docker-wormhole.yml
index 23a491ba512..8204bd0454b 100644
--- a/.github/workflows/ci-docker-wormhole.yml
+++ b/.github/workflows/ci-docker-wormhole.yml
@@ -53,5 +53,5 @@ jobs:
             -v "$PWD:$PWD" \
             -w "$PWD" \
             -e AUTO_APPLY_GIT_HOOKS=false \
-            openjdk:8-jdk-alpine \
+            eclipse-temurin:17-jdk-alpine \
             ./gradlew --no-daemon --continue --scan testcontainers:test --tests '*GenericContainerRuleTest'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 87bc31863e2..ed96bfdcfc7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,9 +50,14 @@ jobs:
     runs-on: ubuntu-22.04
     permissions:
       checks: write
+    strategy:
+      matrix:
+        java: [ '17', '21' ]
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-build
+        with:
+          java-version: ${{ matrix.java }}
       - name: Build and test with Gradle
         run: |
           ./gradlew :testcontainers:check --no-daemon --continue --scan
diff --git a/.sdkmanrc b/.sdkmanrc
index c09dba9cac1..b9fe931c084 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=8.0.372-tem
+java=17.0.12-tem
diff --git a/build.gradle b/build.gradle
index 6cc5c2b8fcf..7f4bad6e835 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ plugins {
     id 'io.franzbecker.gradle-lombok' version '5.0.0'
     id 'com.gradleup.shadow' version '8.3.0'
     id 'me.champeau.gradle.japicmp' version '0.4.3' apply false
-    id 'com.diffplug.spotless' version '6.13.0' apply false
+    id 'com.diffplug.spotless' version '6.22.0' apply false
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"
@@ -26,6 +26,7 @@ captainHook {
 }
 
 subprojects {
+    apply plugin: 'java'
     apply plugin: 'java-library'
     apply plugin: 'idea'
     apply plugin: 'io.franzbecker.gradle-lombok'
@@ -35,9 +36,17 @@ subprojects {
 
     group = "org.testcontainers"
 
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
-    compileJava.options.encoding = 'UTF-8'
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(17)
+        }
+    }
+
+    tasks.withType(JavaCompile) {
+        options.release.set(8)
+        options.encoding = 'UTF-8'
+    }
+
     compileTestJava.options.encoding = 'UTF-8'
     javadoc.options.encoding = 'UTF-8'
 
@@ -126,7 +135,7 @@ subprojects {
     }
 
     checkstyle {
-        toolVersion = "9.3"
+        toolVersion = "10.12.4"
         configFile = rootProject.file('config/checkstyle/checkstyle.xml')
     }
 }
diff --git a/core/src/main/java/org/testcontainers/containers/DockerCompose.java b/core/src/main/java/org/testcontainers/containers/DockerCompose.java
index e1d2b3ead64..82b8a6d5142 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerCompose.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerCompose.java
@@ -4,6 +4,7 @@
 
 interface DockerCompose {
     String ENV_PROJECT_NAME = "COMPOSE_PROJECT_NAME";
+
     String ENV_COMPOSE_FILE = "COMPOSE_FILE";
 
     DockerCompose withCommand(String cmd);
diff --git a/core/src/main/java/org/testcontainers/images/builder/Transferable.java b/core/src/main/java/org/testcontainers/images/builder/Transferable.java
index 292a70d6ac7..32bf199b8a8 100644
--- a/core/src/main/java/org/testcontainers/images/builder/Transferable.java
+++ b/core/src/main/java/org/testcontainers/images/builder/Transferable.java
@@ -10,6 +10,7 @@
 
 public interface Transferable {
     int DEFAULT_FILE_MODE = 0100644;
+
     int DEFAULT_DIR_MODE = 040755;
 
     static Transferable of(String string) {
diff --git a/core/src/test/java/org/testcontainers/TestImages.java b/core/src/test/java/org/testcontainers/TestImages.java
index d8209e29507..0d052f8e963 100644
--- a/core/src/test/java/org/testcontainers/TestImages.java
+++ b/core/src/test/java/org/testcontainers/TestImages.java
@@ -4,9 +4,14 @@
 
 public interface TestImages {
     DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:6-alpine");
+
     DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3.7.25");
+
     DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:4.4");
+
     DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.17");
+
     DockerImageName DOCKER_REGISTRY_IMAGE = DockerImageName.parse("registry:2.7.0");
+
     DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17");
 }
diff --git a/examples/build.gradle b/examples/build.gradle
index 6eaf2f73e49..821f2b4a1fc 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -1,6 +1,6 @@
 // empty build.gradle for dependabot
 plugins {
-    id 'com.diffplug.spotless' version '6.13.0' apply false
+    id 'com.diffplug.spotless' version '6.22.0' apply false
 }
 
 apply from: "$rootDir/../gradle/ci-support.gradle"
@@ -25,7 +25,7 @@ subprojects {
     }
 
     checkstyle {
-        toolVersion = "9.3"
+        toolVersion = "10.12.4"
         configFile = rootProject.file('../config/checkstyle/checkstyle.xml')
     }
 }
diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index d64cd491770..2c3521197d7 100644
Binary files a/examples/gradle/wrapper/gradle-wrapper.jar and b/examples/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index db8c3baafe3..68e8816d71c 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/gradlew b/examples/gradlew
index 1aa94a42690..f5feea6d6b1 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/examples/gradlew.bat b/examples/gradlew.bat
index 6689b85beec..9b42019c791 100644
--- a/examples/gradlew.bat
+++ b/examples/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java
index 8bbbafd189f..af8a823c1de 100644
--- a/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java
+++ b/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java
@@ -4,5 +4,6 @@
 
 public interface LinkedContainerTestImages {
     DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12");
+
     DockerImageName REDMINE_TEST_IMAGE = DockerImageName.parse("redmine:3.3.2");
 }
diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle
index ce71829331e..59b834dbad7 100644
--- a/gradle/spotless.gradle
+++ b/gradle/spotless.gradle
@@ -18,6 +18,6 @@ spotless {
     }
     groovyGradle {
         target '**/*.groovy'
-        greclipse('4.19.0')
+        greclipse('4.19')
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd491770..2c3521197d7 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 a7a990ab2a8..efe2ff34492 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionSha256Sum=258e722ec21e955201e31447b0aed14201765a3bfbae296a46cf60b70e66db70
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a42690..f5feea6d6b1 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85beec..9b42019c791 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java b/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
index 6e18781f2c4..a410f77e8c8 100644
--- a/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
+++ b/modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java
@@ -4,6 +4,7 @@
 
 public interface CockroachDBTestImages {
     DockerImageName COCKROACHDB_IMAGE = DockerImageName.parse("cockroachdb/cockroach:v22.2.3");
+
     DockerImageName FIRST_COCKROACHDB_IMAGE_WITH_ENV_VARS_SUPPORT = DockerImageName.parse(
         "cockroachdb/cockroach:v22.1.0"
     );
diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java
index 9097c4d3457..4343b5dffc8 100644
--- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java
+++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/JUnitJupiterTestImages.java
@@ -4,6 +4,8 @@
 
 public interface JUnitJupiterTestImages {
     DockerImageName POSTGRES_IMAGE = DockerImageName.parse("postgres:9.6.12");
+
     DockerImageName HTTPD_IMAGE = DockerImageName.parse("httpd:2.4-alpine");
+
     DockerImageName MYSQL_IMAGE = DockerImageName.parse("mysql:8.0.32");
 }
diff --git a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
index d0f984f3388..08e50cc1d2a 100644
--- a/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
+++ b/modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackTestImages.java
@@ -4,11 +4,16 @@
 
 public interface LocalstackTestImages {
     DockerImageName LOCALSTACK_IMAGE = DockerImageName.parse("localstack/localstack:0.12.8");
+
     DockerImageName LOCALSTACK_0_10_IMAGE = LOCALSTACK_IMAGE.withTag("0.10.7");
+
     DockerImageName LOCALSTACK_0_11_IMAGE = LOCALSTACK_IMAGE.withTag("0.11.3");
+
     DockerImageName LOCALSTACK_0_12_IMAGE = LOCALSTACK_IMAGE.withTag("0.12.8");
+
     DockerImageName LOCALSTACK_0_13_IMAGE = LOCALSTACK_IMAGE.withTag("0.13.0");
 
     DockerImageName LOCALSTACK_2_3_IMAGE = LOCALSTACK_IMAGE.withTag("2.3");
+
     DockerImageName AWS_CLI_IMAGE = DockerImageName.parse("amazon/aws-cli:2.7.27");
 }
diff --git a/modules/oracle-free/build.gradle b/modules/oracle-free/build.gradle
index 9f1cebf0132..ac81dc66f6e 100644
--- a/modules/oracle-free/build.gradle
+++ b/modules/oracle-free/build.gradle
@@ -14,16 +14,3 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
 }
-
-test {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-}
-
-compileTestJava {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-    options.release.set(11)
-}
diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle
index 43506725f82..3de6202e869 100644
--- a/modules/oracle-xe/build.gradle
+++ b/modules/oracle-xe/build.gradle
@@ -14,16 +14,3 @@ dependencies {
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0'
 }
-
-test {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-}
-
-compileTestJava {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-    options.release.set(11)
-}
diff --git a/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java b/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
index 174cb7b4d4a..498e09f0be4 100644
--- a/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
+++ b/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
@@ -4,5 +4,6 @@
 
 public interface PrestoTestImages {
     DockerImageName PRESTO_TEST_IMAGE = DockerImageName.parse("ghcr.io/trinodb/presto:344");
+
     DockerImageName PRESTO_PREVIOUS_VERSION_TEST_IMAGE = DockerImageName.parse("ghcr.io/trinodb/presto:343");
 }
diff --git a/modules/solace/src/main/java/org/testcontainers/solace/Service.java b/modules/solace/src/main/java/org/testcontainers/solace/Service.java
index de9366a0e31..6ec7de44d08 100644
--- a/modules/solace/src/main/java/org/testcontainers/solace/Service.java
+++ b/modules/solace/src/main/java/org/testcontainers/solace/Service.java
@@ -11,8 +11,11 @@ public enum Service {
     SMF_SSL("smf", 55443, "tcps", true);
 
     private final String name;
+
     private final Integer port;
+
     private final String protocol;
+
     private final boolean supportSSL;
 
     Service(String name, Integer port, String protocol, boolean supportSSL) {
diff --git a/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy b/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy
index 19edca4b459..4b28dbef5c2 100644
--- a/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy
+++ b/modules/spock/src/test/groovy/org/testcontainers/spock/PostgresContainerIT.groovy
@@ -41,6 +41,5 @@ class PostgresContainerIT extends Specification {
 		cleanup:
 		ds.close()
 	}
-
 }
 // }
diff --git a/modules/trino/src/test/java/org/testcontainers/TrinoTestImages.java b/modules/trino/src/test/java/org/testcontainers/TrinoTestImages.java
index 0ac56e54129..e6770bd8993 100644
--- a/modules/trino/src/test/java/org/testcontainers/TrinoTestImages.java
+++ b/modules/trino/src/test/java/org/testcontainers/TrinoTestImages.java
@@ -4,5 +4,6 @@
 
 public interface TrinoTestImages {
     DockerImageName TRINO_TEST_IMAGE = DockerImageName.parse("trinodb/trino:352");
+
     DockerImageName TRINO_PREVIOUS_VERSION_TEST_IMAGE = DockerImageName.parse("trinodb/trino:351");
 }
diff --git a/smoke-test/build.gradle b/smoke-test/build.gradle
index d0998b5f9f2..197452e43c5 100644
--- a/smoke-test/build.gradle
+++ b/smoke-test/build.gradle
@@ -1,6 +1,6 @@
 // empty build.gradle for dependabot
 plugins {
-    id 'com.diffplug.spotless' version '6.13.0' apply false
+    id 'com.diffplug.spotless' version '6.22.0' apply false
 }
 
 apply from: "$rootDir/../gradle/ci-support.gradle"
@@ -25,7 +25,7 @@ subprojects {
     }
 
     checkstyle {
-        toolVersion = "9.3"
+        toolVersion = "10.12.4"
         configFile = rootProject.file('../config/checkstyle/checkstyle.xml')
     }
 }
diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.jar b/smoke-test/gradle/wrapper/gradle-wrapper.jar
index d64cd491770..2c3521197d7 100644
Binary files a/smoke-test/gradle/wrapper/gradle-wrapper.jar and b/smoke-test/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.properties b/smoke-test/gradle/wrapper/gradle-wrapper.properties
index db8c3baafe3..68e8816d71c 100644
--- a/smoke-test/gradle/wrapper/gradle-wrapper.properties
+++ b/smoke-test/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/smoke-test/gradlew b/smoke-test/gradlew
index 1aa94a42690..f5feea6d6b1 100755
--- a/smoke-test/gradlew
+++ b/smoke-test/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/smoke-test/gradlew.bat b/smoke-test/gradlew.bat
index 6689b85beec..9b42019c791 100644
--- a/smoke-test/gradlew.bat
+++ b/smoke-test/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail