diff --git a/composer.json b/composer.json
index 1c6f65328..966ec36a3 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,7 @@
         "yiisoft/di": "^1.0",
         "yiisoft/error-handler": "^2.0",
         "yiisoft/factory": "^1.0",
-        "yiisoft/form": "^1.0@dev",
+        "yiisoft/form": "dev-adjust-validator",
         "yiisoft/html": "^2.0",
         "yiisoft/http": "^1.2",
         "yiisoft/injector": "^1.0",
@@ -68,7 +68,7 @@
         "yiisoft/translator-formatter-intl": "^1.0",
         "yiisoft/translator-message-php": "^1.0",
         "yiisoft/user": "^1.0",
-        "yiisoft/validator": "3.0.x-dev",
+        "yiisoft/validator": "dev-refactoring-v2",
         "yiisoft/var-dumper": "^1.0",
         "yiisoft/view": "^4.0",
         "yiisoft/widget": "^1.0",
@@ -77,10 +77,10 @@
         "yiisoft/yii-cycle": "2.0.x-dev",
         "yiisoft/yii-dataview": "^3.0@dev",
         "yiisoft/yii-debug": "^3.0@dev",
-        "yiisoft/yii-debug-api": "^3.0@dev",
+        "yiisoft/yii-debug-api": "dev-adjust-validator",
         "yiisoft/yii-event": "^1.0",
         "yiisoft/yii-http": "^1.0",
-        "yiisoft/yii-middleware": "dev-master",
+        "yiisoft/yii-middleware": "dev-adjust-validator",
         "yiisoft/yii-runner-console": "^1.0",
         "yiisoft/yii-runner-http": "^1.0",
         "yiisoft/yii-swagger": "^1.0",
diff --git a/src/Auth/Form/LoginForm.php b/src/Auth/Form/LoginForm.php
index 27f20dcb8..1b2ea2895 100644
--- a/src/Auth/Form/LoginForm.php
+++ b/src/Auth/Form/LoginForm.php
@@ -8,7 +8,7 @@
 use Yiisoft\Form\FormModel;
 use Yiisoft\Translator\TranslatorInterface;
 use Yiisoft\Validator\Result;
-use Yiisoft\Validator\Rule\Required;
+use Yiisoft\Validator\Rule\Required\Required;
 
 final class LoginForm extends FormModel
 {
diff --git a/src/Auth/Form/SignupForm.php b/src/Auth/Form/SignupForm.php
index 0e5329625..cac5d1a41 100644
--- a/src/Auth/Form/SignupForm.php
+++ b/src/Auth/Form/SignupForm.php
@@ -8,7 +8,7 @@
 use Yiisoft\Form\FormModel;
 use Yiisoft\Translator\TranslatorInterface;
 use Yiisoft\Validator\Result;
-use Yiisoft\Validator\Rule\Required;
+use Yiisoft\Validator\Rule\Required\Required;
 
 final class SignupForm extends FormModel
 {
diff --git a/src/Blog/Post/PostForm.php b/src/Blog/Post/PostForm.php
index 05890ce7f..b0cfbb40f 100644
--- a/src/Blog/Post/PostForm.php
+++ b/src/Blog/Post/PostForm.php
@@ -5,7 +5,7 @@
 namespace App\Blog\Post;
 
 use Yiisoft\Form\FormModel;
-use Yiisoft\Validator\Rule\Required;
+use Yiisoft\Validator\Rule\Required\Required;
 
 final class PostForm extends FormModel
 {
diff --git a/src/Contact/ContactForm.php b/src/Contact/ContactForm.php
index 182570215..f14d5aadb 100644
--- a/src/Contact/ContactForm.php
+++ b/src/Contact/ContactForm.php
@@ -5,8 +5,8 @@
 namespace App\Contact;
 
 use Yiisoft\Form\FormModel;
-use Yiisoft\Validator\Rule\Email;
-use Yiisoft\Validator\Rule\Required;
+use Yiisoft\Validator\Rule\Email\Email;
+use Yiisoft\Validator\Rule\Required\Required;
 
 final class ContactForm extends FormModel
 {