diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
deleted file mode 100644
index 85418d3..0000000
--- a/.github/workflows/checks.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Checks
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-jobs:
-  roave-bc-check:
-    name: Roave BC Check
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Roave BC Check
-        uses: "docker://nyholm/roave-bc-check-ga"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b480393..ad3f5c4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - '*.x'
   pull_request:
 
 jobs:
@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0']
+        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -25,15 +25,8 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - name: Install PHP 7 dependencies
+      - name: Install dependencies
         run: composer update --prefer-dist --no-interaction --no-progress
-        if: "startsWith(matrix.php, '7.')"
-
-      - name: Install PHP 8 dependencies
-        run: |
-          composer require "phpdocumentor/reflection-docblock:^5.2@dev" --no-interaction --no-update
-          composer update --prefer-dist --prefer-stable --no-interaction --no-progress --ignore-platform-req=php
-        if: "startsWith(matrix.php, '8.')"
 
       - name: Execute tests
         run: composer test
@@ -43,11 +36,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['7.1', '7.4', '8.0']
+        php: ['7.1', '7.4', '8.0', '8.1', '8.2']
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -70,7 +63,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index a8dcf9a..98c17c1 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -3,7 +3,7 @@ name: Static analysis
 on:
   push:
     branches:
-      - master
+      - '*.x'
   pull_request:
 
 jobs:
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: PHPStan
         uses: docker://oskarstark/phpstan-ga
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: PHP-CS-Fixer
         uses: docker://oskarstark/php-cs-fixer-ga
diff --git a/composer.json b/composer.json
index 268b27e..c169089 100644
--- a/composer.json
+++ b/composer.json
@@ -25,13 +25,8 @@
         "psr/http-message": "^1.0"
     },
     "require-dev": {
-        "friends-of-phpspec/phpspec-code-coverage": "^4.1",
-        "phpspec/phpspec": "^5.1 || ^6.0"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.x-dev"
-        }
+        "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0",
+        "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0"
     },
     "autoload": {
         "psr-4": {