diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql.yml
similarity index 93%
rename from .github/workflows/codeql-analysis.yml
rename to .github/workflows/codeql.yml
index 2eeb9e5c..dbd9d464 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql.yml
@@ -26,7 +26,7 @@ jobs:
       security-events: write
 
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         # Languages to scan
         language: [ 'java' ]
@@ -56,3 +56,5 @@ jobs:
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3348e66a..e30e67f7 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -2,7 +2,7 @@
 # including making pull requests review easier
 
 # Human-readable name in the actions tab
-name: Java CI
+name: Maven Build
 
 # Build on every pull request regardless of the branch
 # Wiki: https://help.github.com/en/actions/reference/events-that-trigger-workflows
@@ -20,6 +20,8 @@ jobs:
 
     # Environment image - always use the newest OS
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
 
     # Run steps
     steps: