diff --git a/.github/workflows/lint-and-analyse.yml b/.github/workflows/lint-and-analyse.yml
index e3917f3..a1122ba 100644
--- a/.github/workflows/lint-and-analyse.yml
+++ b/.github/workflows/lint-and-analyse.yml
@@ -6,40 +6,38 @@ permissions:
 on: [push]
 
 jobs:
-    lint-php:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v4
-            - name: Cache module
-              uses: actions/cache@v4
-              with:
-                  path: ~/.composer/cache/
-                  key: composer-cache
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: "7.4"
-                  tools: composer:v2
-            - name: Install dependencies
-              run: composer install --no-interaction --prefer-dist --no-progress --no-suggest
-            - name: Lint files
-              run: composer run phpcs
+  lint-php:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache module
+        uses: actions/cache@v4
+        with:
+          path: ~/.composer/cache/
+          key: composer-cache
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "8.2"
+      - name: Install dependencies
+        run: composer install --no-interaction --prefer-dist --no-progress --no-suggest
+      - name: Lint files
+        run: composer run phpcs
 
-    analyse-php:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v4
-            - name: Cache module
-              uses: actions/cache@v4
-              with:
-                  path: ~/.composer/cache/
-                  key: composer-cache
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: "7.4"
-                  tools: composer:v2
-            - name: Install dependencies
-              run: composer install --no-interaction --prefer-dist --no-progress --no-suggest
-            - name: Analyse files
-              run: composer run phpstan
+  analyse-php:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache module
+        uses: actions/cache@v4
+        with:
+          path: ~/.composer/cache/
+          key: composer-cache
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "8.2"
+      - name: Install dependencies
+        run: composer install --no-interaction --prefer-dist --no-progress --no-suggest
+      - name: Analyse files
+        run: composer run phpstan
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8eb7d2d..4b5ddd1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,6 +9,7 @@ jobs:
     test-php:
         name: Test on php ${{ matrix.php-version }} and ${{ matrix.os }}
         runs-on: ${{ matrix.os }}
+        continue-on-error: ${{ matrix.experimental }}
         services:
           mysql:
             image: mysql:5.7
@@ -21,9 +22,13 @@ jobs:
               - "3306:3306"
             options: --name mysql-server --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
         strategy:
+            fail-fast: false
             matrix:
-                php-version: ["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]
+                php-version: ["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]
                 os: [ubuntu-latest]
+                experimental: [false]
+                include:
+                - { php-version: 'nightly', os: ubuntu-latest, experimental: true }
         steps:
             - uses: actions/checkout@v4
             - name: Use php ${{ matrix.php-version }}