diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2bf8f1c..a10029d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [11, 17, 21]
+        version: [17, 21, 25]
     steps:
       - name: Checkout
         uses: actions/checkout@v6
diff --git a/build.gradle b/build.gradle
index 634cb15..b6de740 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,11 +5,11 @@ plugins {
 	id 'eclipse'
 	id 'pmd'
 
-	id 'com.diffplug.spotless' version '6.21.0'
+	id 'com.diffplug.spotless' version '8.1.0'
 
 	/* We have to use this 3rd party plugin for publishing to MavenCentral because as of AUG-2025 there is no official
 	 * plugin which supports publishing to MavenCentral Portal. */
-	id "com.vanniktech.maven.publish.base" version "0.34.0"
+	id "com.vanniktech.maven.publish.base" version "0.36.0"
 }
 
 allprojects {
@@ -69,7 +69,7 @@ allprojects {
 
 	pmd {
 		consoleOutput = true
-		toolVersion = "7.12.0"
+		toolVersion = "7.20.0"
 
 		// This tells PMD to use your custom ruleset file.
 		ruleSetFiles = rootProject.files("config/pmd/pmd-ruleset.xml")
diff --git a/core/src/main/java/cloud/stackit/sdk/core/KeyFlowAuthenticator.java b/core/src/main/java/cloud/stackit/sdk/core/KeyFlowAuthenticator.java
index 9d7bb64..1a1077e 100644
--- a/core/src/main/java/cloud/stackit/sdk/core/KeyFlowAuthenticator.java
+++ b/core/src/main/java/cloud/stackit/sdk/core/KeyFlowAuthenticator.java
@@ -19,7 +19,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.spec.InvalidKeySpecException;
-import java.util.Date;
+import java.time.Instant;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -200,7 +200,7 @@ public KeyFlowTokenResponse(
 		}
 
 		protected boolean isExpired() {
-			return expiresIn < new Date().toInstant().getEpochSecond();
+			return expiresIn < Instant.now().getEpochSecond();
 		}
 
 		protected String getAccessToken() {
@@ -342,8 +342,8 @@ private String generateSelfSignedJWT()
 				.withSubject(saKey.getCredentials().getSub())
 				.withJWTId(UUID.randomUUID().toString())
 				.withAudience(saKey.getCredentials().getAud())
-				.withIssuedAt(new Date())
-				.withExpiresAt(new Date().toInstant().plusSeconds(10 * 60))
+				.withIssuedAt(Instant.now())
+				.withExpiresAt(Instant.now().plusSeconds(10 * 60))
 				.withHeader(jwtHeader)
 				.sign(algorithm);
 	}
diff --git a/core/src/main/java/cloud/stackit/sdk/core/auth/SetupAuth.java b/core/src/main/java/cloud/stackit/sdk/core/auth/SetupAuth.java
index 0dec702..660b40a 100644
--- a/core/src/main/java/cloud/stackit/sdk/core/auth/SetupAuth.java
+++ b/core/src/main/java/cloud/stackit/sdk/core/auth/SetupAuth.java
@@ -327,7 +327,7 @@ protected static String readValueFromCredentialsFile(
 		} catch (ClassCastException ignored) {
 		}
 		if (Utils.isStringSet(keyPath)) {
-			return new String(Files.readAllBytes(Paths.get(keyPath)));
+			return new String(Files.readAllBytes(Paths.get(keyPath)), StandardCharsets.UTF_8);
 		}
 		throw new CredentialsInFileNotFoundException(
 				"could not find " + valueKey + " or " + pathKey + " in " + path);
diff --git a/examples/alb/src/main/java/cloud/stackit/sdk/alb/examples/AlbExample.java b/examples/alb/src/main/java/cloud/stackit/sdk/alb/examples/AlbExample.java
index 49176e9..871cfa4 100644
--- a/examples/alb/src/main/java/cloud/stackit/sdk/alb/examples/AlbExample.java
+++ b/examples/alb/src/main/java/cloud/stackit/sdk/alb/examples/AlbExample.java
@@ -18,7 +18,6 @@ private AlbExample() {}
 		"PMD.CognitiveComplexity",
 		"PMD.CommentSize",
 		"PMD.CyclomaticComplexity",
-		"PMD.NPathComplexity",
 		"PMD.NcssCount",
 		"PMD.SystemPrintln",
 		"PMD.AvoidThrowingRawExceptionTypes"
diff --git a/examples/authentication/src/main/java/cloud/stackit/sdk/authentication/examples/AuthenticationExample.java b/examples/authentication/src/main/java/cloud/stackit/sdk/authentication/examples/AuthenticationExample.java
index 52f70b0..d6ed785 100644
--- a/examples/authentication/src/main/java/cloud/stackit/sdk/authentication/examples/AuthenticationExample.java
+++ b/examples/authentication/src/main/java/cloud/stackit/sdk/authentication/examples/AuthenticationExample.java
@@ -7,6 +7,7 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Scanner;
 
 final class AuthenticationExample {
@@ -53,7 +54,7 @@ public static void main(String[] args) throws IOException {
 				"examples/authentication/src/main/java/cloud/stackit/sdk/authentication/examples/dummy_credentials/dummy-service-account-key.json";
 		File serviceAccountKeyFile = new File(serviceAccountKeyPath);
 		StringBuilder serviceAccountKeyContent = new StringBuilder();
-		try (Scanner myReader = new Scanner(serviceAccountKeyFile)) {
+		try (Scanner myReader = new Scanner(serviceAccountKeyFile, StandardCharsets.UTF_8.name())) {
 			while (myReader.hasNextLine()) {
 				serviceAccountKeyContent.append(myReader.nextLine());
 			}
@@ -66,7 +67,7 @@ public static void main(String[] args) throws IOException {
 				"examples/authentication/src/main/java/cloud/stackit/sdk/authentication/examples/dummy_credentials/dummy-private-key.pem";
 		File privateKeyFile = new File(privateKeyPath);
 		StringBuilder privateKeyContent = new StringBuilder();
-		try (Scanner myReader = new Scanner(privateKeyFile)) {
+		try (Scanner myReader = new Scanner(privateKeyFile, StandardCharsets.UTF_8.name())) {
 			while (myReader.hasNextLine()) {
 				privateKeyContent.append(myReader.nextLine());
 			}
diff --git a/examples/loadbalancer/src/main/java/cloud/stackit/sdk/loadbalancer/examples/LoadBalancerExample.java b/examples/loadbalancer/src/main/java/cloud/stackit/sdk/loadbalancer/examples/LoadBalancerExample.java
index 164aabd..d282149 100644
--- a/examples/loadbalancer/src/main/java/cloud/stackit/sdk/loadbalancer/examples/LoadBalancerExample.java
+++ b/examples/loadbalancer/src/main/java/cloud/stackit/sdk/loadbalancer/examples/LoadBalancerExample.java
@@ -18,7 +18,6 @@ private LoadBalancerExample() {}
 		"PMD.CognitiveComplexity",
 		"PMD.CommentSize",
 		"PMD.CyclomaticComplexity",
-		"PMD.NPathComplexity",
 		"PMD.NcssCount",
 		"PMD.SystemPrintln",
 		"PMD.AvoidThrowingRawExceptionTypes"
diff --git a/examples/objectstorage/src/main/java/cloud/stackit/sdk/objectstorage/examples/ObjectStorageExample.java b/examples/objectstorage/src/main/java/cloud/stackit/sdk/objectstorage/examples/ObjectStorageExample.java
index f98e7c6..a083c1c 100644
--- a/examples/objectstorage/src/main/java/cloud/stackit/sdk/objectstorage/examples/ObjectStorageExample.java
+++ b/examples/objectstorage/src/main/java/cloud/stackit/sdk/objectstorage/examples/ObjectStorageExample.java
@@ -19,8 +19,6 @@ private ObjectStorageExample() {}
 
 	@SuppressWarnings({
 		"PMD.CyclomaticComplexity",
-		"PMD.CognitiveComplexity",
-		"PMD.NPathComplexity",
 		"PMD.NcssCount",
 		"PMD.SystemPrintln",
 		"PMD.AvoidThrowingRawExceptionTypes"
diff --git a/examples/resourcemanager/src/main/java/cloud/stackit/sdk/resourcemanager/examples/ResourcemanagerExample.java b/examples/resourcemanager/src/main/java/cloud/stackit/sdk/resourcemanager/examples/ResourcemanagerExample.java
index 9e8af32..eacc71e 100644
--- a/examples/resourcemanager/src/main/java/cloud/stackit/sdk/resourcemanager/examples/ResourcemanagerExample.java
+++ b/examples/resourcemanager/src/main/java/cloud/stackit/sdk/resourcemanager/examples/ResourcemanagerExample.java
@@ -24,7 +24,7 @@ final class ResourcemanagerExample {
 	/** Prevent instantiation */
 	private ResourcemanagerExample() {}
 
-	@SuppressWarnings({"PMD.SystemPrintln", "PMD.AvoidThrowingRawExceptionTypes"})
+	@SuppressWarnings({"PMD.SystemPrintln"})
 	public static void main(String[] args)
 			throws IOException, ApiException, InterruptedException, ExecutionException {
 		// Credentials are read from the credentialsFile in `~/.stackit/credentials.json` or the env
diff --git a/examples/serverupdate/src/main/java/cloud/stackit/sdk/serverupdate/examples/ServerUpdateExample.java b/examples/serverupdate/src/main/java/cloud/stackit/sdk/serverupdate/examples/ServerUpdateExample.java
index ea8eb46..facb511 100644
--- a/examples/serverupdate/src/main/java/cloud/stackit/sdk/serverupdate/examples/ServerUpdateExample.java
+++ b/examples/serverupdate/src/main/java/cloud/stackit/sdk/serverupdate/examples/ServerUpdateExample.java
@@ -20,7 +20,6 @@ private ServerUpdateExample() {}
 	@SuppressWarnings({
 		"PMD.CyclomaticComplexity",
 		"PMD.CognitiveComplexity",
-		"PMD.NPathComplexity",
 		"PMD.NcssCount",
 		"PMD.SystemPrintln",
 		"PMD.AvoidThrowingRawExceptionTypes",
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e644113..1b33c55 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 b82aa23..19a6bde 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.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 9d0ce63..23d15a9 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/.
@@ -69,35 +71,35 @@ app_path=$0
 
 # Need this for daisy-chained symlinks.
 while
-APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-[ -h "$app_path" ]
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
 do
-ls=$( ls -ld "$app_path" )
-link=${ls#*' -> '}
-case $link in             #(
-/*)   app_path=$link ;; #(
-*)    app_path=$APP_HOME$link ;;
-esac
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
 
 # This is normally unused
 # 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\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
 warn () {
-echo "$*"
+    echo "$*"
 } >&2
 
 die () {
-echo
-echo "$*"
-echo
-exit 1
+    echo
+    echo "$*"
+    echo
+    exit 1
 } >&2
 
 # OS specific support (must be 'true' or 'false').
@@ -106,57 +108,57 @@ msys=false
 darwin=false
 nonstop=false
 case "$( uname )" in                #(
-CYGWIN* )         cygwin=true  ;; #(
-Darwin* )         darwin=true  ;; #(
-MSYS* | MINGW* )  msys=true    ;; #(
-NONSTOP* )        nonstop=true ;;
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
-if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-# IBM's JDK on AIX uses strange locations for the executables
-JAVACMD=$JAVA_HOME/jre/sh/java
-else
-JAVACMD=$JAVA_HOME/bin/java
-fi
-if [ ! -x "$JAVACMD" ] ; then
-die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-fi
+    fi
 else
-JAVACMD=java
-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.
+    JAVACMD=java
+    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
 fi
 
 # Increase the maximum file descriptors if we can.
 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=SC2039,SC3045
-MAX_FD=$( ulimit -H -n ) ||
-warn "Could not query maximum file descriptor limit"
-esac
-case $MAX_FD in  #(
-'' | soft) :;; #(
-*)
-# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-# shellcheck disable=SC2039,SC3045
-ulimit -n "$MAX_FD" ||
-warn "Could not set maximum file descriptor limit to $MAX_FD"
-esac
+    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=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
 # Collect all arguments for the java command, stacking in reverse order:
@@ -169,33 +171,33 @@ fi
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
-APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-# Now convert the arguments - kludge to limit ourselves to /bin/sh
-for arg do
-if
-case $arg in                                #(
--*)   false ;;                            # don't mess with options #(
-/?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-[ -e "$t" ] ;;                      #(
-*)    false ;;
-esac
-then
-arg=$( cygpath --path --ignore --mixed "$arg" )
-fi
-# Roll the args list around exactly as many times as the number of
-# args, so each arg winds up back in the position where it started, but
-# possibly modified.
-#
-# NB: a `for` loop captures its iteration list before it begins, so
-# changing the positional parameters here affects neither the number of
-# iterations, nor the values presented in `arg`.
-shift                   # remove old arg
-set -- "$@" "$arg"      # push replacement arg
-done
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
 
@@ -203,21 +205,21 @@ fi
 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,
+#   * DEFAULT_JVM_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" \
--classpath "$CLASSPATH" \
-org.gradle.wrapper.GradleWrapperMain \
-"$@"
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
 
 # Stop when "xargs" is not available.
 if ! command -v xargs >/dev/null 2>&1
 then
-die "xargs is not available"
+    die "xargs is not available"
 fi
 
 # Use "xargs" to parse quoted args.
@@ -240,10 +242,10 @@ fi
 #
 
 eval "set -- $(
-printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-xargs -n1 |
-sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-tr '\n' ' '
-)" '"$@"'
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 25da30d..5eed7ee 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,92 +1,94 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-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
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-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
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@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 ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+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
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+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
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/services/resourcemanager/src/main/java/cloud/stackit/sdk/resourcemanager/wait/ResourcemanagerWait.java b/services/resourcemanager/src/main/java/cloud/stackit/sdk/resourcemanager/wait/ResourcemanagerWait.java
index 2bc192d..d694808 100644
--- a/services/resourcemanager/src/main/java/cloud/stackit/sdk/resourcemanager/wait/ResourcemanagerWait.java
+++ b/services/resourcemanager/src/main/java/cloud/stackit/sdk/resourcemanager/wait/ResourcemanagerWait.java
@@ -87,14 +87,12 @@ private static AsyncActionHandler<GetProjectResponse> createOrUpdateProjectWaitH
 				() -> {
 					GetProjectResponse projectResponse = apiClient.getProject(containerId, false);
 					if (projectResponse.getContainerId().equals(containerId)
-							&& projectResponse.getLifecycleState().equals(LifecycleState.ACTIVE)) {
+							&& projectResponse.getLifecycleState() == LifecycleState.ACTIVE) {
 						return new AsyncActionResult<>(true, projectResponse);
 					}
 
 					if (projectResponse.getContainerId().equals(containerId)
-							&& projectResponse
-									.getLifecycleState()
-									.equals(LifecycleState.CREATING)) {
+							&& projectResponse.getLifecycleState() == LifecycleState.CREATING) {
 						return new AsyncActionResult<>(false, null);
 					}
 					// An invalid state was received which should not be possible.
@@ -138,9 +136,7 @@ public static AsyncActionHandler<Void> deleteProjectWaitHandler(
 						GetProjectResponse projectResponse =
 								apiClient.getProject(containerId, false);
 						if (projectResponse.getContainerId().equals(containerId)
-								&& projectResponse
-										.getLifecycleState()
-										.equals(LifecycleState.DELETING)) {
+								&& projectResponse.getLifecycleState() == LifecycleState.DELETING) {
 							return new AsyncActionResult<>(true, null);
 						}