diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8d29359..2740b4fe 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -31,12 +31,12 @@ jobs:
           - 17
         # Support 1-year-old version + latest minor
         maven:
-          - 3.8.5
+          - 3.8.7
           - 3.8.8
-          - 3.9.2
+          - 3.9.5
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: s4u/setup-maven-action@v1.7.0
+      - uses: s4u/setup-maven-action@v1.11.0
         with:
           java-distribution: 'temurin'
           java-version: ${{ matrix.java }}
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 3c6fda8c..eacdc9ed 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 03de55a4..2aec17bb 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -34,6 +34,7 @@ Build / Infrastructure::
   * Fix maven-source-plugin configuration for releases (#644)
   * Set Java 11 as minimal version (remove Java8 support) (#652)
   * Use Maven v3.9.2 in CI and wrapper (#658)
+  * Use Maven v3.9.5 in CI and wrapper (#662)
 
 Documentation::