diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c094d40b..e026e05c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -4,64 +4,64 @@
 name: "CodeQL"
 
 on:
-  # Scan only for push on the primary branch for now
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
+    # Scan only for push on the primary branch for now
+    push:
+        branches: [ main ]
+    pull_request:
+        branches: [ main ]
 
 jobs:
-  # job i
-  analyze:
+    # job i
+    analyze:
 
-    # Display name
-    name: Analyze
+        # Display name
+        name: Analyze
 
-    # Environment
-    runs-on: ubuntu-latest
+        # Environment
+        runs-on: ubuntu-latest
 
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
+        permissions:
+            actions: read
+            contents: read
+            security-events: write
 
-    strategy:
-      fail-fast: false
-      matrix:
-        # Languages to scan
-        language: [ 'java' ]
+        strategy:
+            fail-fast: false
+            matrix:
+                # Languages to scan
+                language: [ 'java' ]
 
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
+        steps:
+            -   name: Checkout repository
+                uses: actions/checkout@v3
 
-    # Setup Java
-    - name: Set up JDK
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'adopt'
-        # Use Java 16, because it's minimum required version by Geyser
-        java-version: 16
-        cache: 'maven'
+            # Setup Java
+            -   name: Set up JDK
+                uses: actions/setup-java@v3
+                with:
+                    distribution: 'temurin'
+                    # Use Java 16+, because it's minimum required version by Geyser
+                    java-version: 17
+                    cache: 'maven'
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
+            # Initializes the CodeQL tools for scanning.
+            -   name: Initialize CodeQL
+                uses: github/codeql-action/init@v2
+                with:
+                    languages: ${{ matrix.language }}
 
-    # Cache build process too like in the maven config
-    - uses: actions/cache@v3.0.1
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
+            # Cache build process too like in the maven config
+            -   uses: actions/cache@v3.0.1
+                with:
+                    path: ~/.m2/repository
+                    key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+                    restore-keys: |
+                        ${{ runner.os }}-maven-
 
-    # Auto build attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+            # Auto build attempts to build any compiled languages  (C/C++, C#, or Java).
+            # If this step fails, then you should remove it and run the build manually (see below)
+            -   name: Autobuild
+                uses: github/codeql-action/autobuild@v2
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+            -   name: Perform CodeQL Analysis
+                uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index aec91bc7..bb1603e7 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -7,37 +7,37 @@ name: Java CI
 # Build on every pull request regardless of the branch
 # Wiki: https://help.github.com/en/actions/reference/events-that-trigger-workflows
 on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
+    push:
+        branches:
+            - main
+    pull_request:
+        branches:
+            - main
 
 jobs:
-  # job id
-  build_and_test:
+    # job id
+    build_and_test:
 
-    # Environment image - always use the newest OS
-    runs-on: ubuntu-latest
+        # Environment image - always use the newest OS
+        runs-on: ubuntu-latest
 
-    # Run steps
-    steps:
-      # Pull changes
-      - uses: actions/checkout@v3
+        # Run steps
+        steps:
+            # Pull changes
+            -   uses: actions/checkout@v3
 
-      # Setup Java
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          # Use Java 16, because it's minimum required version by Geyser
-          java-version: 16
-          cache: 'maven'
+            # Setup Java
+            -   name: Set up JDK
+                uses: actions/setup-java@v3
+                with:
+                    distribution: 'temurin'
+                    # Use Java 16+, because it's minimum required version by Geyser
+                    java-version: 17
+                    cache: 'maven'
 
-      # Build and test (included in package)
-      - name: Build with Maven and test
-        # Run non-interactive, package (with compile+test),
-        # ignore snapshot updates, because they are likely to have breaking changes, enforce checksums to validate
-        # possible errors in dependencies
-        run: mvn test --batch-mode --no-snapshot-updates --strict-checksums --file pom.xml
+            # Build and test (included in package)
+            -   name: Build with Maven and test
+                # Run non-interactive, package (with compile+test),
+                # ignore snapshot updates, because they are likely to have breaking changes, enforce checksums to validate
+                # possible errors in dependencies
+                run: mvn test --batch-mode --no-snapshot-updates --strict-checksums --file pom.xml