diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d8b2cd76..230c7b85 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,14 +34,14 @@ jobs:
           key: m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             m2-
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 17
       - name: Generate settings.xml for Maven Builds
-        uses: whelk-io/maven-settings-xml-action@v21
+        uses: whelk-io/maven-settings-xml-action@v22
         with:
           repositories: '[{ "id": "jboss", "name": "JBoss", "url": "https://repository.jboss.org/nexus/content/groups/public" }]'
       - name: Print Version
@@ -52,11 +52,11 @@ jobs:
         shell: bash
         run: tar -czf maven-repo.tgz -C ~ .m2/repository
       - name: Persist Maven Repo
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: maven-repo
           path: maven-repo.tgz
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: surefire-reports-build
@@ -93,9 +93,9 @@ jobs:
       - name: Host information
         run: |
           hostname || true
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Download Maven Repo
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: maven-repo
           path: .
@@ -108,14 +108,14 @@ jobs:
           distribution: ${{ matrix.openjdk_impl }}
           java-version: ${{ matrix.jdk }}
       - name: Generate settings.xml for Maven Builds
-        uses: whelk-io/maven-settings-xml-action@v21
+        uses: whelk-io/maven-settings-xml-action@v22
         with:
           repositories: '[{ "id": "jboss", "name": "JBoss", "url": "https://repository.jboss.org/nexus/content/groups/public" }]'
       - name: Print Version
         run: mvn -v
       - name: Run Tests
         run: mvn -U -B -fae test -Pproxy '-Dopenssl=${{ matrix.openssl }} -DfailIfNoTests=false' -pl ${{ matrix.module }}
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: surefire-reports-${{ matrix.jdk }}-${{ matrix.module }}-${{ matrix.os }}
@@ -144,9 +144,9 @@ jobs:
       - name: Host information
         run: |
           hostname || true
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Download Maven Repo
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: maven-repo
           path: .
@@ -158,14 +158,14 @@ jobs:
         with:
           java-version: ${{ matrix.jdk }}
       - name: Generate settings.xml for Maven Builds
-        uses: whelk-io/maven-settings-xml-action@v21
+        uses: whelk-io/maven-settings-xml-action@v22
         with:
           repositories: '[{ "id": "jboss", "name": "JBoss", "url": "https://repository.jboss.org/nexus/content/groups/public" }]'
       - name: Print Version
         run: mvn -v
       - name: Run Tests
         run: mvn -U -B -fae test ${{ matrix.proxy && '-Pproxy' || '' }} '-DfailIfNoTests=false' -pl ${{ matrix.module }} -Dtest.ipv6=true
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: surefire-reports-${{ matrix.jdk }}-ipv6-${{ matrix.module }}${{ matrix.proxy }}-${{ matrix.os }}
diff --git a/.github/workflows/nightly-integration.yml b/.github/workflows/nightly-integration.yml
index bdc70c2b..f81eca91 100644
--- a/.github/workflows/nightly-integration.yml
+++ b/.github/workflows/nightly-integration.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout Undertow
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: undertow-io/undertow
           ref: '2.4.x'
@@ -42,7 +42,7 @@ jobs:
         run:  |
           cd ~
           find ./.m2/repository -type d -name "*SNAPSHOT" -print0 | xargs -0 tar -czf ~/undertow-maven-repository.tar.gz
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: undertow-maven-repository
           path: ~/undertow-maven-repository.tar.gz
@@ -61,14 +61,14 @@ jobs:
 
     steps:
       - name: Checkout Undertow EE
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
           cache: 'maven'
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v6
         with:
           name: undertow-maven-repository
           path: .
@@ -78,7 +78,7 @@ jobs:
           tar -xzf undertow-maven-repository.tar.gz -C ~
       - name: Build with Maven Java ${{ matrix.java }} - ${{ matrix.os }}
         run:  mvn -V clean install -U -B -fae ${{ matrix.profile }} '-Dversion.io.undertow=${{ needs.snapshot-build.outputs.undertow-version }}'
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.profile }}