diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index e211a2cb..b525c628 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -40,8 +40,7 @@ jobs:
                 uses: actions/setup-java@v3
                 with:
                     distribution: 'temurin'
-                    # Use Java 16+, because it's minimum required version by Geyser
-                    java-version: 17
+                    java-version: 18
                     cache: 'maven'
 
             # Initializes the CodeQL tools for scanning.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index bb1603e7..1046981b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -31,8 +31,7 @@ jobs:
                 uses: actions/setup-java@v3
                 with:
                     distribution: 'temurin'
-                    # Use Java 16+, because it's minimum required version by Geyser
-                    java-version: 17
+                    java-version: 18
                     cache: 'maven'
 
             # Build and test (included in package)