diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a31b3c0..75eab15 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,9 +24,3 @@ name: build
 jobs:
   phpunit:
     uses: yiisoft/actions/.github/workflows/phpunit.yml@master
-    with:
-      composer-command: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi --ignore-platform-req=php+
-      os: >-
-        ['ubuntu-latest']
-      php: >-
-        ['8.1', '8.2', '8.3']
diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml
index 59be2fc..5df1d4a 100644
--- a/.github/workflows/dependency-check.yml
+++ b/.github/workflows/dependency-check.yml
@@ -26,8 +26,3 @@ name: dependency-check
 jobs:
   composer-require-checker:
     uses: yiisoft/actions/.github/workflows/composer-require-checker.yml@master
-    with:
-      os: >-
-        ['ubuntu-latest']
-      php: >-
-        ['8.1']
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
index 598077b..d821b99 100644
--- a/.github/workflows/mutation.yml
+++ b/.github/workflows/mutation.yml
@@ -26,7 +26,3 @@ jobs:
       STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
     with:
       extensions: runkit7
-      os: >-
-        ['ubuntu-latest']
-      php: >-
-        ['8.1']
diff --git a/composer.json b/composer.json
index fa04f61..958c41f 100644
--- a/composer.json
+++ b/composer.json
@@ -24,29 +24,24 @@
             "email": "archibeardrinker@gmail.com"
         }
     ],
+    "minimum-stability": "dev",
     "require": {
         "php": ">=8.1",
         "psr/event-dispatcher": "^1.0",
         "symfony/mailer": "^6.4 || ^7.0",
         "symfony/mime": "^6.4 || ^7.0",
-        "yiisoft/yii2": ">=2.0.4"
+        "yiisoft/yii2": "22.0.x-dev"
     },
     "require-dev": {
         "maglnet/composer-require-checker": "^4.7",
         "phpunit/phpunit": "^10.5",
-        "roave/infection-static-analysis-plugin": "^1.34",
+        "roave/infection-static-analysis-plugin": "^1.35",
         "symplify/easy-coding-standard": "^12.1",
-        "vimeo/psalm": "^5.20"
+        "vimeo/psalm": "^5.26.1|^6.4.1"
     },
     "suggest": {
         "yiisoft/yii2-psr-log-source": "Allows routing transport logs to your Yii2 logger"
     },
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://asset-packagist.org"
-        }
-    ],
     "autoload": {
         "psr-4": {
             "yii\\symfonymailer\\": "src"
@@ -58,9 +53,6 @@
         ]
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "3.0.x-dev"
-        },
         "sort-packages": true
     },
     "config": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 6e24b41..4b6ced4 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phpunit
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   bootstrap="./tests/bootstrap.php"
-  colors="true" stopOnFailure="false"
-  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
   cacheDirectory=".phpunit.cache"
+  colors="true"
   requireCoverageMetadata="true"
+  stopOnFailure="false"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
 >
   <testsuites>
     <testsuite name="Yii2-swiftmailer Test Suite">
diff --git a/src/DkimMessageSigner.php b/src/DkimMessageSigner.php
index 3fc7df7..e6b7d26 100644
--- a/src/DkimMessageSigner.php
+++ b/src/DkimMessageSigner.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
diff --git a/src/Message.php b/src/Message.php
index 20ae328..f8cf094 100644
--- a/src/Message.php
+++ b/src/Message.php
@@ -244,7 +244,7 @@ public function attach($fileName, array $options = []): self
         $this->email->attachFromPath(
             $fileName,
             $options['fileName'] ?? $fileName,
-            $options['contentType'] ?? FileHelper::getMimeType($fileName)
+            $options['contentType'] ?? FileHelper::getMimeType($fileName),
         );
         return $this;
     }
@@ -272,7 +272,7 @@ public function embed($fileName, array $options = []): string
         $this->email->embedFromPath(
             $fileName,
             $name,
-            $options['contentType'] ?? FileHelper::getMimeType($fileName)
+            $options['contentType'] ?? FileHelper::getMimeType($fileName),
         );
         return 'cid:' . $name;
     }
diff --git a/src/MessageEncrypterInterface.php b/src/MessageEncrypterInterface.php
index aed824e..8656b94 100644
--- a/src/MessageEncrypterInterface.php
+++ b/src/MessageEncrypterInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
diff --git a/src/MessageSignerInterface.php b/src/MessageSignerInterface.php
index d2412ee..99c6f3c 100644
--- a/src/MessageSignerInterface.php
+++ b/src/MessageSignerInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
diff --git a/src/MessageWrapperInterface.php b/src/MessageWrapperInterface.php
index 2e2de75..987dda3 100644
--- a/src/MessageWrapperInterface.php
+++ b/src/MessageWrapperInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
diff --git a/src/SMimeMessageEncrypter.php b/src/SMimeMessageEncrypter.php
index ac9cfa1..62d5710 100644
--- a/src/SMimeMessageEncrypter.php
+++ b/src/SMimeMessageEncrypter.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
diff --git a/src/SMimeMessageSigner.php b/src/SMimeMessageSigner.php
index 0c3990d..2b56a3e 100644
--- a/src/SMimeMessageSigner.php
+++ b/src/SMimeMessageSigner.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC