diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4454322..26c3bd7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,20 +37,18 @@ jobs:
                   tools: composer:v2, flex
 
             - name: Validate composer.json
-              run: composer validate --no-check-lock
-
-            - name: Remove analysis dependencies
-              run: composer remove --dev --no-update sylius-labs/coding-standard vimeo/psalm
-              if: matrix.symfony-version == '6.0.*'
+              run: composer validate --strict
 
             - name: Install dependencies
               run: composer install --prefer-dist --no-progress
               env:
                   SYMFONY_REQUIRE: "${{ matrix.symfony-version }}"
 
-            - name: Run analysis
-              run: composer analyse
-              if: matrix.symfony-version != '6.0.*'
+            - name: Run coding standard
+              run: vendor/bin/ecs check --ansi --no-progress-bar src tests
+
+            - name: Run Psalm
+              run: vendor/bin/psalm src --no-progress --php-version="${{ matrix.php-version }}"
 
             - name: Run tests
               run: composer test
diff --git a/composer.json b/composer.json
index a782887..edb2060 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "friends-of-behat/mink-extension": "^2.5",
         "friends-of-behat/page-object-extension": "^0.3.2",
         "friends-of-behat/service-container-extension": "^1.1",
-        "sylius-labs/coding-standard": "^3.2",
+        "sylius-labs/coding-standard": "^4.1.1",
         "symfony/browser-kit": "^4.4 || ^5.1 || ^6.0",
         "symfony/framework-bundle": "^4.4 || ^5.1 || ^6.0",
         "symfony/process": "^4.4 || ^5.1 || ^6.0",
diff --git a/easy-coding-standard.yml b/easy-coding-standard.yml
deleted file mode 100644
index 2403599..0000000
--- a/easy-coding-standard.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-imports:
-    - { resource: 'vendor/sylius-labs/coding-standard/easy-coding-standard.yml' }
diff --git a/ecs.php b/ecs.php
new file mode 100644
index 0000000..d2c4877
--- /dev/null
+++ b/ecs.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $containerConfigurator->import(__DIR__ . '/vendor/sylius-labs/coding-standard/ecs.php');
+};
diff --git a/psalm.xml b/psalm.xml
index 38fcca1..3115a12 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -27,5 +27,12 @@
                 <file name="src/Mink/MinkParameters.php" />
             </errorLevel>
         </InvalidAttribute>
+
+        <!-- Workaround for https://github.com/vimeo/psalm/issues/7026 -->
+        <ReservedWord>
+            <errorLevel type="suppress">
+                <directory name="src" />
+            </errorLevel>
+        </ReservedWord>
     </issueHandlers>
 </psalm>
diff --git a/tests/Behat/Context/TestContext.php b/tests/Behat/Context/TestContext.php
index 4e66d02..8bcf1e8 100644
--- a/tests/Behat/Context/TestContext.php
+++ b/tests/Behat/Context/TestContext.php
@@ -78,7 +78,8 @@ public function standardSymfonyAutoloaderConfigured(): void
      */
     public function workingSymfonyApplicationWithExtension(): void
     {
-        $this->thereIsConfiguration(<<<'CON'
+        $this->thereIsConfiguration(
+            <<<'CON'
 default:
     extensions:
         FriendsOfBehat\SymfonyExtension:
@@ -89,7 +90,9 @@ class: App\Kernel
 
         $this->standardSymfonyAutoloaderConfigured();
 
-        $this->thereIsFile('src/Kernel.php', <<<'CON'
+        $this->thereIsFile(
+            'src/Kernel.php',
+            <<<'CON'
 <?php
 
 declare(strict_types=1);
@@ -140,7 +143,9 @@ protected function configureRoutes($routes): void
 CON
         );
 
-        $this->thereIsFile('src/Controller.php', <<<'CON'
+        $this->thereIsFile(
+            'src/Controller.php',
+            <<<'CON'
 <?php
 
 declare(strict_types=1);
@@ -168,7 +173,9 @@ public function helloWorld(): Response
 CON
         );
 
-        $this->thereIsFile('src/Counter.php', <<<'CON'
+        $this->thereIsFile(
+            'src/Counter.php',
+            <<<'CON'
 <?php
 
 declare(strict_types=1);
@@ -192,7 +199,9 @@ public function get(): int
 CON
         );
 
-        $this->thereIsFile('config/default.yaml', <<<'YML'
+        $this->thereIsFile(
+            'config/default.yaml',
+            <<<'YML'
 services:
     App\Controller:
         arguments: