diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 55238c0d..e402d71f 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -35,17 +35,17 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
       with:
-        java-version: '8'
-        distribution: 'adopt'
+        java-version: '17'
+        distribution: 'temurin'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -65,12 +65,11 @@ jobs:
     #    and modify them (or add more) to build your code if your project
     #    uses a compiled language
 
+      # Note: Assumes we're running on Ubuntu
+      # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
     - name: Build
       #run: ./gradlew build --warning-mode all
-      uses: GabrielBB/xvfb-action@v1
-      with:
-        run: ./gradlew build -xsign -xpublish --warning-mode all
-        working-directory: ./ #optional
+      run: xvfb-run ./gradlew build -xsign -xpublish --warning-mode all
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 3dd07727..18e97603 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -16,23 +16,25 @@ jobs:
 
     strategy:
       matrix:
-        java: [ '8', '11', '14', '17']
+        java: [ '17', '21', '23' ]
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v2
-      with:
-        java-version: ${{ matrix.java }}
-        distribution: 'adopt'
-
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: Build with Gradle
-      #run: ./gradlew build --warning-mode all
-      uses: GabrielBB/xvfb-action@v1
-      with:
-        run: ./gradlew build -xsign -xpublish --warning-mode all
-        working-directory: ./ #optional
+      - uses: actions/checkout@v4
+
+      - name: Verify gradle wrapper
+        uses: gradle/actions/wrapper-validation@v4
+        if: matrix.java == '17'
+
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'temurin'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      # Note: Assumes we're running on Ubuntu
+      # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
+      - name: Build with Gradle
+        run: xvfb-run ./gradlew build -xsign -xpublish --warning-mode all