diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 60bfde3..aa5fa31 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,16 +17,18 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: ["8.0", "8.1"]
-                symfony: ["5.4.*", "6.0.*", "6.1.*"]
+                php: ["8.1", "8.2", "8.3"]
+                symfony: ["^5.4", "^6.4", "^7.0"]
                 twig: ["^2.12", "^3.3"]
                 exclude:
-                    - php: "8.0"
-                      symfony: "6.1.*"
+                    - twig: "^2.12"
+                      symfony: "^7.0"
+                    - php: "8.1"
+                      symfony: "^7.0"
 
         steps:
             -
-                uses: actions/checkout@v2
+                uses: actions/checkout@v4
 
             -
                 name: Setup PHP
@@ -57,15 +59,7 @@ jobs:
                     (cd src/Component && composer update ${{ matrix.composer-flags }} --no-scripts)
 
             -
-                name: Run analysis with Symfony 5
-                if: matrix.symfony == '5.4.*'
-                run: |
-                    composer analyse-symfony5
-                    (cd src/Component && composer validate --strict)
-
-            -
-                name: Run analysis with Symfony 6
-                if: matrix.symfony != '5.4.*'
+                name: Run analysis
                 run: |
                     composer analyse
                     (cd src/Component && composer validate --strict)
diff --git a/composer.json b/composer.json
index b4c38ae..286d6bd 100644
--- a/composer.json
+++ b/composer.json
@@ -24,13 +24,13 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "sylius-labs/polyfill-symfony-event-dispatcher": "^1.0",
-        "symfony/config": "^5.4 || ^6.0",
+        "symfony/config": "^5.4 || ^6.4 || ^7.0",
         "symfony/deprecation-contracts": "^2.1 || ^3.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
-        "symfony/framework-bundle": "^5.4 || ^6.0",
-        "symfony/http-kernel": "^5.4 || ^6.0",
+        "symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
+        "symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0",
+        "symfony/http-kernel": "^5.4 || ^6.4 || ^7.0",
         "twig/twig": "^2.12 || ^3.3",
         "webmozart/assert": "^1.9"
     },
@@ -38,7 +38,7 @@
         "sylius/mailer": "self.version"
     },
     "require-dev": {
-        "matthiasnoback/symfony-dependency-injection-test": "^4.2",
+        "matthiasnoback/symfony-dependency-injection-test": "^5.0",
         "phpspec/phpspec": "^7.0",
         "phpstan/phpstan": "1.8.5",
         "phpstan/phpstan-phpunit": "1.1.1",
@@ -46,12 +46,11 @@
         "phpunit/phpunit": "^9.4",
         "rector/rector": "^0.13.6",
         "sylius-labs/coding-standard": "^4.0",
-        "symfony/console": "^5.4 || ^6.0",
-        "symfony/dotenv": "^5.4 || ^6.0",
-        "symfony/event-dispatcher": "^5.4 || ^6.0",
-        "symfony/mailer": "^5.4 || ^6.0",
-        "symfony/twig-bundle": "^5.4 || ^6.0",
-        "vimeo/psalm": "^4.22"
+        "symfony/console": "^5.4 || ^6.4 || ^7.0",
+        "symfony/dotenv": "^5.4 || ^6.4 || ^7.0",
+        "symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0",
+        "symfony/mailer": "^5.4 || ^6.4 || ^7.0",
+        "symfony/twig-bundle": "^5.4 || ^6.4 || ^7.0"
     },
     "extra": {
         "branch-alias": {
@@ -85,14 +84,7 @@
         "analyse": [
             "@composer validate --strict",
             "vendor/bin/ecs check src",
-            "vendor/bin/phpstan analyse --ansi -c phpstan.neon -l max src",
-            "vendor/bin/psalm src"
-        ],
-        "analyse-symfony5": [
-            "@composer validate --strict",
-            "vendor/bin/ecs check src",
-            "vendor/bin/phpstan analyse --ansi -c phpstan.symfony5.neon -l max src",
-            "vendor/bin/psalm -c psalm.symfony5.xml src"
+            "vendor/bin/phpstan analyse --ansi -c phpstan.neon -l max src"
         ],
         "fix": [
             "vendor/bin/ecs check src --fix"
diff --git a/phpstan.symfony5.neon b/phpstan.symfony5.neon
deleted file mode 100644
index 546d012..0000000
--- a/phpstan.symfony5.neon
+++ /dev/null
@@ -1,21 +0,0 @@
-includes:
-    - vendor/phpstan/phpstan-webmozart-assert/extension.neon
-    - vendor/phpstan/phpstan-phpunit/extension.neon
-
-    - vendor/phpstan/phpstan-phpunit/rules.neon
-
-parameters:
-    checkMissingIterableValueType: false
-
-    excludePaths:
-        - %currentWorkingDirectory%/src/Bundle/DependencyInjection/Configuration.php
-        - %currentWorkingDirectory%/src/Bundle/spec/*
-        - %currentWorkingDirectory%/src/Bundle/test/*
-        - %currentWorkingDirectory%/src/Bundle/tests/*
-        - %currentWorkingDirectory%/src/Component/spec/*
-        - %currentWorkingDirectory%/src/Component/vendor/*
-
-    ignoreErrors:
-        - '/Property Sylius\\Component\\Mailer\\Model\\Email\:\:\$id is never written\, only read\./'
-        - '/PHPDoc tag \@param references unknown parameter\: \$bccRecipients/'
-        - '/PHPDoc tag \@param references unknown parameter\: \$ccRecipients/'
diff --git a/psalm.symfony5.xml b/psalm.symfony5.xml
deleted file mode 100644
index 51a1153..0000000
--- a/psalm.symfony5.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
->
-    <projectFiles>
-        <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-            <directory name="src/Bundle/spec" />
-            <directory name="src/Bundle/test" />
-            <directory name="src/Bundle/tests" />
-            <directory name="src/Component/spec" />
-            <directory name="src/Component/vendor" />
-        </ignoreFiles>
-    </projectFiles>
-
-    <issueHandlers>
-        <InvalidDocblockParamName>
-            <errorLevel type="suppress">
-                <file name="src/Component/Sender/SenderInterface.php" />
-            </errorLevel>
-        </InvalidDocblockParamName>
-
-        <PossiblyNullReference>
-            <errorLevel type="suppress">
-                <file name="src/Bundle/DependencyInjection/Configuration.php" />
-            </errorLevel>
-        </PossiblyNullReference>
-
-        <PossiblyUndefinedMethod>
-            <errorLevel type="suppress">
-                <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeDefinition::scalarNode" />
-            </errorLevel>
-        </PossiblyUndefinedMethod>
-
-        <TooManyArguments>
-            <errorLevel type="suppress">
-                <referencedFunction name="Symfony\Component\Config\Definition\Builder\TreeBuilder::__construct" />
-                <referencedFunction name="Symfony\Contracts\EventDispatcher\EventDispatcherInterface::dispatch" />
-            </errorLevel>
-        </TooManyArguments>
-
-        <NonInvariantDocblockPropertyType>
-            <errorLevel type="suppress">
-                <file name="src/Bundle/Renderer/Adapter/EmailDefaultAdapter.php" />
-                <file name="src/Bundle/Sender/Adapter/DefaultAdapter.php" />
-            </errorLevel>
-        </NonInvariantDocblockPropertyType>
-    </issueHandlers>
-</psalm>
diff --git a/psalm.xml b/psalm.xml
deleted file mode 100644
index b6aab53..0000000
--- a/psalm.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
->
-    <projectFiles>
-        <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-            <directory name="src/Bundle/spec" />
-            <directory name="src/Bundle/test" />
-            <directory name="src/Bundle/tests" />
-            <file name="src/Bundle/DependencyInjection/SyliusMailerExtension.php" />
-            <directory name="src/Component/spec" />
-            <directory name="src/Component/vendor" />
-        </ignoreFiles>
-    </projectFiles>
-
-    <issueHandlers>
-        <InvalidDocblockParamName>
-            <errorLevel type="suppress">
-                <file name="src/Component/Sender/SenderInterface.php" />
-            </errorLevel>
-        </InvalidDocblockParamName>
-
-        <PossiblyNullReference>
-            <errorLevel type="suppress">
-                <file name="src/Bundle/DependencyInjection/Configuration.php" />
-            </errorLevel>
-        </PossiblyNullReference>
-
-        <PossiblyUndefinedMethod>
-            <errorLevel type="suppress">
-                <referencedMethod name="Symfony\Component\Config\Definition\Builder\VariableNodeDefinition::scalarNode" />
-            </errorLevel>
-        </PossiblyUndefinedMethod>
-
-        <NonInvariantDocblockPropertyType>
-            <errorLevel type="suppress">
-                <file name="src/Bundle/Renderer/Adapter/EmailDefaultAdapter.php" />
-                <file name="src/Bundle/Sender/Adapter/DefaultAdapter.php" />
-            </errorLevel>
-        </NonInvariantDocblockPropertyType>
-
-        <InvalidArgument>
-            <errorLevel type="suppress">
-                <file name="src/Bundle/Sender/Adapter/SymfonyMailerAdapter.php" />
-            </errorLevel>
-        </InvalidArgument>
-    </issueHandlers>
-</psalm>