diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b10ef5e3..61abfbf5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [main]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   source:
     runs-on: ubuntu-22.04
@@ -210,6 +214,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
         ts:
           - nts
           - zts
@@ -265,6 +270,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
         ts:
           - nts
           - zts
@@ -421,6 +427,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
         ts:
           - nts
           - zts
@@ -477,6 +484,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
         ts:
           - nts
           - zts
@@ -525,6 +533,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
         ts:
           - nts
           - zts
@@ -581,6 +590,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
         ts:
           - nts
           - zts
@@ -626,9 +636,10 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - '8.3.4'
-          - '8.2.17'
-          - '8.1.27'
+          - '8.4.1'
+          - '8.3.14'
+          - '8.2.26'
+          - '8.1.31'
         ts:
           - nts
           - zts
diff --git a/.github/workflows/versions.yml b/.github/workflows/versions.yml
index 5ac0c03e..835ae519 100644
--- a/.github/workflows/versions.yml
+++ b/.github/workflows/versions.yml
@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [main]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   source_abi:
     runs-on: ubuntu-22.04
@@ -69,7 +73,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           extensions: json, mbstring, intl
         env:
           phpts: nts
@@ -127,7 +131,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           extensions: json, mbstring, intl
         env:
           phpts: nts
@@ -185,7 +189,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           # https://github.com/shivammathur/icu-intl#icu4c-builds
           extensions: json, mbstring, intl-74.1
         env:
@@ -246,7 +250,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           # https://github.com/shivammathur/icu-intl#icu4c-builds
           extensions: json, mbstring, intl-74.1
         env:
@@ -313,7 +317,7 @@ jobs:
           # winget install NASM.NASM
           choco install nasm
           git clone --no-progress https://github.com/php/php-sdk-binary-tools.git c:\php\php-sdk
-          git clone --no-progress --depth 1 --branch php-8.3.4 https://github.com/php/php-src.git c:\php\php-src
+          git clone --no-progress --depth 1 --branch php-8.4.1 https://github.com/php/php-src.git c:\php\php-src
       - uses: actions/download-artifact@v4
         with:
           path: c:\php
@@ -353,7 +357,7 @@ jobs:
         id: package
         working-directory: c:\php
         run: |
-          $PhpVersion = ("8.3.4" -split '\.')[0..1] -join '.'
+          $PhpVersion = ("8.4.1" -split '\.')[0..1] -join '.'
           Add-Content -Path $env:GITHUB_OUTPUT -Value "php_version=$PhpVersion"
           $SourceDirectory = (Get-ChildItem -Path "c:\php" -Directory "couchbase-*" | Select-Object -First 1).FullName
           $DistName = "couchbase-${{ matrix.version }}-windows-x64"
@@ -388,7 +392,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
           extensions: json, mbstring, intl, sockets
         env:
           phpts: nts
@@ -419,7 +423,7 @@ jobs:
           Expand-Archive -Path couchbase-${{ needs.source_abi.outputs.alternate_abi_version }}-windows-x64.zip
           $env:TEST_ABI='both'; ruby ./bin/test.rb -v ${{ needs.source_abi.outputs.abi_version }} -v ${{ needs.source_abi.outputs.alternate_abi_version }} -v unversioned
           $env:TEST_ABI='versioned'; ruby ./bin/test.rb -v ${{ needs.source_abi.outputs.abi_version }}
-          
+
           ruby -e '
             file_paths = [
              "couchbase-unversioned-windows-x64/couchbase-unversioned-windows-x64/Couchbase/ExtensionNamespaceResolver.php",