diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 402e930..e2ceab4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,9 +12,8 @@ jobs:
             fail-fast: false
             matrix:
                 php:
-                    - '7.4'
-                    - '8.0'
                     - '8.1'
+                    - '8.2'
                 coverage: ['none']
                 symfony-versions:
                     - '4.4.*'
@@ -22,16 +21,22 @@ jobs:
                     - '5.2.*'
                     - '5.3.*'
                 include:
+                    - php: '7.4'
+                      symfony-versions: '^4.4'
+                      coverage: 'none'
+                    - php: '7.4'
+                      symfony-versions: '^5.4'
+                      coverage: 'none'
                     - php: '8.0'
-                      symfony-versions: '^6.0'
+                      symfony-versions: '^5.4'
                       coverage: 'none'
-                    - php: '8.1'
+                    - php: '8.0'
                       symfony-versions: '^6.0'
                       coverage: 'none'
                     - description: 'Log Code Coverage'
-                      php: '8.0'
+                      php: '8.2'
                       coverage: 'xdebug'
-                      symfony-versions: '^5.2'
+                      symfony-versions: '^6.2'
 
         name: PHP ${{ matrix.php }} Symfony ${{ matrix.symfony-versions }} ${{ matrix.description }}
         steps:
diff --git a/.github/workflows/gitleaks.yaml b/.github/workflows/gitleaks.yaml
deleted file mode 100644
index 7150248..0000000
--- a/.github/workflows/gitleaks.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: gitleaks
-
-on:
-    pull_request:
-    push:
-        branches: [ master, develop ]
-
-jobs:
-    gitleaks:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v1
-
-            - name: Run gitleaks
-              uses: zricethezav/gitleaks-action@master
-              
diff --git a/README.md b/README.md
index b0d17a9..a8db897 100644
--- a/README.md
+++ b/README.md
@@ -83,11 +83,11 @@ Go to `behat.yml`
 ...
 ```
 
-[master Build Status]: https://github.com/macpaw/BehatMessengerContext/actions?query=workflow%3ACI+branch%3Amaster
-[master Build Status Image]: https://github.com/macpaw/BehatMessengerContext/workflows/CI/badge.svg?branch=master
-[develop Build Status]: https://github.com/macpaw/BehatMessengerContext/actions?query=workflow%3ACI+branch%3Adevelop
-[develop Build Status Image]: https://github.com/macpaw/BehatMessengerContext/workflows/CI/badge.svg?branch=develop
-[master Code Coverage]: https://codecov.io/gh/macpaw/BehatMessengerContext/branch/master
-[master Code Coverage Image]: https://img.shields.io/codecov/c/github/macpaw/BehatMessengerContext/master?logo=codecov
-[develop Code Coverage]: https://codecov.io/gh/macpaw/BehatMessengerContext/branch/develop
-[develop Code Coverage Image]: https://img.shields.io/codecov/c/github/macpaw/BehatMessengerContext/develop?logo=codecov
+[master Build Status]: https://github.com/macpaw/behat-messenger-context/actions?query=workflow%3ACI+branch%3Amaster
+[master Build Status Image]: https://github.com/macpaw/behat-messenger-context/workflows/CI/badge.svg?branch=master
+[develop Build Status]: https://github.com/macpaw/behat-messenger-context/actions?query=workflow%3ACI+branch%3Adevelop
+[develop Build Status Image]: https://github.com/macpaw/behat-messenger-context/workflows/CI/badge.svg?branch=develop
+[master Code Coverage]: https://codecov.io/gh/macpaw/behat-messenger-context/branch/master
+[master Code Coverage Image]: https://img.shields.io/codecov/c/github/macpaw/behat-messenger-context/master?logo=codecov
+[develop Code Coverage]: https://codecov.io/gh/macpaw/behat-messenger-context/branch/develop
+[develop Code Coverage Image]: https://img.shields.io/codecov/c/github/macpaw/behat-messenger-context/develop?logo=codecov
diff --git a/commitlint.config.js b/commitlint.config.js
deleted file mode 100644
index ce51e9d..0000000
--- a/commitlint.config.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = {
-    extends: ['@commitlint/config-conventional'],
-    rules: {
-        'scope-case': [
-            2,
-            'never',
-            [],
-        ],
-        'header-max-length': [2, 'always', 300],
-        'subject-case': [
-            2,
-            'never',
-            ['pascal-case', 'camel-case', 'snake-case', 'kebab-case'],
-        ],
-    }
-}
diff --git a/composer.json b/composer.json
index 0c9532d..0368a4f 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
         "macpaw/similar-arrays": "^1.0"
     },
     "require-dev": {
-        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan": "^1.9",
         "phpunit/phpunit": "^9.3",
         "slevomat/coding-standard": "^7.0",
         "squizlabs/php_codesniffer": "^3.6"
@@ -52,7 +52,7 @@
     },
     "scripts": {
         "composer-validate": "composer validate",
-        "phpstan": "./vendor/bin/phpstan analyse -l max",
+        "phpstan": "./vendor/bin/phpstan analyse",
         "code-style": "./vendor/bin/phpcs",
         "code-style-fix": "./vendor/bin/phpcbf",
         "phpunit": "./vendor/bin/phpunit",
@@ -62,5 +62,10 @@
             "@code-style",
             "@phpunit"
         ]
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }
diff --git a/package.json b/package.json
deleted file mode 100644
index e592e8d..0000000
--- a/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "behat-messenger-context",
-  "devDependencies": {
-    "@commitlint/cli": "^11.0.0",
-    "@commitlint/config-conventional": "^11.0.0"
-  },
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint --verbose -E HUSKY_GIT_PARAMS"
-    }
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/MacPaw/BehatMessengerContext.git"
-  },
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/MacPaw/BehatMessengerContext/issues"
-  },
-  "homepage": "https://github.com/MacPaw/BehatMessengerContext#readme"
-}
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 0000000..22368e9
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,6 @@
+parameters:
+    excludes_analyse:
+    paths:
+        - src
+    level: 5
+    treatPhpDocTypesAsCertain: false
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
deleted file mode 100644
index 657c85a..0000000
--- a/phpstan.neon.dist
+++ /dev/null
@@ -1,8 +0,0 @@
-parameters:
-    excludes_analyse:
-    paths:
-        - src
-    level: 8
-    treatPhpDocTypesAsCertain: false
-    ignoreErrors:
-        - '#Parameter \#1 \$value of function count expects array|Countable, iterable<Symfony\\Component\\Messenger\\Envelope> given.*#'