diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 04dbca9..4df9239 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -30,15 +30,40 @@ jobs:
           java-version: '21'
           distribution: 'temurin'
 
+      - name: Cache Maven dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Configure Maven Central mirror
+        run: |
+          mkdir -p ~/.m2
+          cat > ~/.m2/settings.xml <<'EOF'
+          <settings>
+            <mirrors>
+              <mirror>
+                <id>central-mirror</id>
+                <name>Central Mirror</name>
+                <url>https://repo1.maven.org/maven2</url>
+                <mirrorOf>central</mirrorOf>
+              </mirror>
+            </mirrors>
+          </settings>
+          EOF
+
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
+          build-mode: manual
 
-      - name: Build with Maven
-        run: mvn clean compile
+      - name: Build and test with Maven
+        run: mvn -B clean compile -Dmaven.wagon.http.retryHandler.count=5
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
         with:
           category: "/language:${{matrix.language}}"
\ No newline at end of file
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 92823cb..065cd47 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Build project and run UI test
         uses: coactions/setup-xvfb@v1
         with:
-          run: mvn clean verify -Pci
+          run: mvn -B clean verify -Pci
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v5
diff --git a/.github/workflows/maven_central_publish.yml b/.github/workflows/maven_central_publish.yml
index dcbc3d0..64b6e28 100644
--- a/.github/workflows/maven_central_publish.yml
+++ b/.github/workflows/maven_central_publish.yml
@@ -39,6 +39,6 @@ jobs:
             }]
 
       - name: Release package
-        run: mvn clean deploy -Prelease,maven-central -DskipTests
+        run: mvn -B clean deploy -Prelease,maven-central -DskipTests
         env:
           GPG_SECRET_KEY_PASSPHRASE: ${{ secrets.GPG_SECRET_KEY_PASSPHRASE }}
diff --git a/.github/workflows/maven_github_publish.yml b/.github/workflows/maven_github_publish.yml
index dbd87ff..f16ee3c 100644
--- a/.github/workflows/maven_github_publish.yml
+++ b/.github/workflows/maven_github_publish.yml
@@ -38,7 +38,7 @@ jobs:
             }]
 
       - name: Publish package
-        run: mvn --batch-mode deploy -Prelease -DskipTests
+        run: mvn -B deploy -Prelease -DskipTests
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           GPG_SECRET_KEY_PASSPHRASE: ${{ secrets.GPG_SECRET_KEY_PASSPHRASE }}
\ No newline at end of file
diff --git a/README.md b/README.md
index f1874c0..c577f41 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # WindowTester Pro
 
-![GitHub release (v5.*)](https://img.shields.io/github/v/release/r4fterman/windowtester?filter=v5.*&display_name=tag)
-[![Maven Central Version](https://img.shields.io/maven-central/v/io.github.r4fterman/com.windowtester.runtime?strategy=highestVersion&filter=5*)](https://mvnrepository.com/search?q=windowtester)
-![Static Badge](https://img.shields.io/badge/Java-v17-blue)
-![Static Badge](https://img.shields.io/badge/Maven-v3.5.4-blue)
+![GitHub release (v6.*)](https://img.shields.io/github/v/release/r4fterman/windowtester?filter=v6.*&display_name=tag)
+[![Maven Central Version](https://img.shields.io/maven-central/v/io.github.r4fterman/com.windowtester.runtime?strategy=highestVersion&filter=6*)](https://mvnrepository.com/search?q=windowtester)
+![Static Badge](https://img.shields.io/badge/Java-v21-blue)
+![Static Badge](https://img.shields.io/badge/Maven-v3.9.9-blue)
 [![License](https://img.shields.io/badge/License-EPL--1.0-green.svg)](LICENSE.md)
 [![Build WindowTester](https://github.com/r4fterman/windowtester/actions/workflows/maven.yml/badge.svg)](https://github.com/r4fterman/windowtester/actions/workflows/maven.yml)
 [![codecov](https://codecov.io/gh/r4fterman/windowtester/graph/badge.svg?token=fEDTM853bU)](https://codecov.io/gh/r4fterman/windowtester)
@@ -34,7 +34,7 @@ can be run within your IDE, or they can be automated to run using [Maven](http:/
 ## Requirements
 
 - JDK 21
-- JUnit 5
+- JUnit 6
 
 Supported platforms: