diff --git a/.github/workflows/_build.yml b/.github/workflows/_build.yml
index 8d0d7797f..4189be39d 100644
--- a/.github/workflows/_build.yml
+++ b/.github/workflows/_build.yml
@@ -12,13 +12,14 @@ jobs:
       matrix:
         java-version:
           - "21"
+          - "17"
           - "11"
           - "8"
         distribution:
           - "temurin"
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
 
diff --git a/.github/workflows/_codeql.yml b/.github/workflows/_codeql.yml
index d20115ff0..e52a09168 100644
--- a/.github/workflows/_codeql.yml
+++ b/.github/workflows/_codeql.yml
@@ -26,18 +26,14 @@ jobs:
 
     strategy:
       fail-fast: false
-      matrix:
-        language: [ 'java' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -51,7 +47,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, 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@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -64,6 +60,6 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
-        category: "/language:${{matrix.language}}"
+        category: "/language:java"
diff --git a/.github/workflows/_publish-code.yml b/.github/workflows/_publish-code.yml
index 4b39834be..757cfc03f 100644
--- a/.github/workflows/_publish-code.yml
+++ b/.github/workflows/_publish-code.yml
@@ -8,7 +8,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
 
diff --git a/.github/workflows/_publish-docs.yml b/.github/workflows/_publish-docs.yml
index d03a3e925..f03886cab 100644
--- a/.github/workflows/_publish-docs.yml
+++ b/.github/workflows/_publish-docs.yml
@@ -9,7 +9,7 @@ jobs:
     name: Publish Documentation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
 
diff --git a/.github/workflows/_static-analysis.yml b/.github/workflows/_static-analysis.yml
index 491599990..90f0d536c 100644
--- a/.github/workflows/_static-analysis.yml
+++ b/.github/workflows/_static-analysis.yml
@@ -8,7 +8,7 @@ jobs:
     name: Check Code Style
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
 
diff --git a/.github/workflows/_test-code-samples.yml b/.github/workflows/_test-code-samples.yml
index bf5dcac2c..1d58d737e 100644
--- a/.github/workflows/_test-code-samples.yml
+++ b/.github/workflows/_test-code-samples.yml
@@ -21,15 +21,14 @@ jobs:
     strategy:
       matrix:
         java-version:
-          - "21"
-          - "17"
+          - "25"
           - "11"
           - "8"
         distribution:
           - "temurin"
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Set up JDK ${{ matrix.java-version }}
diff --git a/.github/workflows/_test-integrations.yml b/.github/workflows/_test-integrations.yml
index 1d191603a..d06e361aa 100644
--- a/.github/workflows/_test-integrations.yml
+++ b/.github/workflows/_test-integrations.yml
@@ -30,7 +30,7 @@ jobs:
           - "temurin"
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
 
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 8c536432d..6d5aa856a 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -16,7 +16,7 @@ jobs:
     secrets: inherit
   codeql:
     uses: ./.github/workflows/_codeql.yml
-    needs: build
+    needs: static_analysis
     permissions:
       contents: read
       actions: read
diff --git a/pom.xml b/pom.xml
index 4454264d5..23a33a0a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -447,7 +447,7 @@
     <org.mockito.inline.version>4.11.0</org.mockito.inline.version>
     <org.mockito.junit.jupiter.version>4.11.0</org.mockito.junit.jupiter.version>
     <org.projectlombok.lombok-mapstruct-binding.version>0.2.0</org.projectlombok.lombok-mapstruct-binding.version>
-    <org.projectlombok.version>1.18.32</org.projectlombok.version>
+    <org.projectlombok.version>1.18.38</org.projectlombok.version>
     <org.slf4j.version>2.0.17</org.slf4j.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <surefire.addOpens></surefire.addOpens>