diff --git a/perxis-proto b/perxis-proto
index f954a6b764e2d0f60b911582fb28a078ebfcce93..062d090c3a8e44d3cc4ca61678bf58c0e7377812 160000
--- a/perxis-proto
+++ b/perxis-proto
@@ -1 +1 @@
-Subproject commit f954a6b764e2d0f60b911582fb28a078ebfcce93
+Subproject commit 062d090c3a8e44d3cc4ca61678bf58c0e7377812
diff --git a/pkg/setup/collection.go b/pkg/setup/collection.go
index 6d4a2333438f070e3c59aa7e602820a3814039ab..db7a919e29aae3e1517739f4adedb00bc66f41ce 100644
--- a/pkg/setup/collection.go
+++ b/pkg/setup/collection.go
@@ -7,7 +7,6 @@ import (
 
 	"git.perx.ru/perxis/perxis-go/pkg/collections"
 	"git.perx.ru/perxis/perxis-go/pkg/data"
-	"git.perx.ru/perxis/perxis-go/pkg/environments"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	"git.perx.ru/perxis/perxis-go/pkg/extension"
 	"git.perx.ru/perxis/perxis-go/pkg/schema"
@@ -140,7 +139,7 @@ func (s *Setup) InstallCollections(ctx context.Context) (err error) {
 	}
 
 	if migrate {
-		if err = s.content.Environments.Migrate(ctx, s.SpaceID, s.EnvironmentID, &environments.MigrateOptions{Wait: true}); err != nil {
+		if err = s.content.Environments.Migrate(ctx, s.SpaceID, s.EnvironmentID); err != nil {
 			s.logger.Error(
 				"Failed to migrate environment",
 				zap.String("Space ID", s.SpaceID),
diff --git a/pkg/setup/collection_test.go b/pkg/setup/collection_test.go
index 20867b2d13fc031875a5627dabca8f06c0830106..5edb94e1b00671264a82401a4c648fed5cc1405d 100644
--- a/pkg/setup/collection_test.go
+++ b/pkg/setup/collection_test.go
@@ -43,7 +43,7 @@ func TestSetup_InstallCollections(t *testing.T) {
 				svc.On("SetSchema", mock.Anything, "sp", "env", "1", schema.New("name", field.String())).Return(nil).Once()
 			},
 			envsCall: func(svc *envmocks.Environments) {
-				svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(nil).Once()
+				svc.On("Migrate", mock.Anything, "sp", "env").Return(nil).Once()
 			},
 			wantErr: func(t *testing.T, err error) {
 				assert.NoError(t, err)
@@ -57,7 +57,7 @@ func TestSetup_InstallCollections(t *testing.T) {
 				svc.On("Create", mock.Anything, &collections.Collection{ID: "1", SpaceID: "sp", Name: "space", EnvID: "env", View: &collections.View{SpaceID: "sp", EnvID: "env", CollectionID: "3"}}).Return(&collections.Collection{ID: "1", SpaceID: "sp", Name: "space", EnvID: "env", View: &collections.View{SpaceID: "sp", EnvID: "env", CollectionID: "3"}}, nil).Once()
 			},
 			envsCall: func(svc *envmocks.Environments) {
-				svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(nil).Once()
+				svc.On("Migrate", mock.Anything, "sp", "env").Return(nil).Once()
 			},
 			wantErr: func(t *testing.T, err error) {
 				assert.NoError(t, err)
@@ -88,7 +88,7 @@ func TestSetup_InstallCollections(t *testing.T) {
 				svc.On("SetSchema", mock.Anything, "sp", "env", "2", schema.New("name", field.String())).Return(nil).Once()
 			},
 			envsCall: func(svc *envmocks.Environments) {
-				svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(nil).Twice()
+				svc.On("Migrate", mock.Anything, "sp", "env").Return(nil).Twice()
 			},
 			wantErr: func(t *testing.T, err error) {
 				assert.NoError(t, err)
@@ -116,7 +116,7 @@ func TestSetup_InstallCollections(t *testing.T) {
 				svc.On("SetSchema", mock.Anything, "sp", "env", "1", schema.New("name", field.String()).WithMetadata(extension.ExtensionMetadataKey, "test-extension")).Return(nil).Once()
 			},
 			envsCall: func(svc *envmocks.Environments) {
-				svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(nil).Once()
+				svc.On("Migrate", mock.Anything, "sp", "env").Return(nil).Once()
 			},
 			wantErr: func(t *testing.T, err error) {
 				assert.NoError(t, err)
@@ -143,7 +143,7 @@ func TestSetup_InstallCollections(t *testing.T) {
 				svc.On("SetSchema", mock.Anything, "sp", "env", "1", schema.New("name", field.String()).WithMetadata(extension.ExtensionMetadataKey, "test-extension")).Return(nil).Once()
 			},
 			envsCall: func(svc *envmocks.Environments) {
-				svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(nil).Once()
+				svc.On("Migrate", mock.Anything, "sp", "env").Return(nil).Once()
 			},
 			wantErr: func(t *testing.T, err error) {
 				assert.NoError(t, err)
@@ -159,7 +159,7 @@ func TestSetup_InstallCollections(t *testing.T) {
 				svc.On("SetSchema", mock.Anything, "sp", "env", "1", schema.New("name", field.String()).WithMetadata(extension.ExtensionMetadataKey, "test-extension")).Return(nil).Once()
 			},
 			envsCall: func(svc *envmocks.Environments) {
-				svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(nil).Once()
+				svc.On("Migrate", mock.Anything, "sp", "env").Return(nil).Once()
 			},
 			wantErr: func(t *testing.T, err error) {
 				assert.NoError(t, err)
@@ -174,7 +174,7 @@ func TestSetup_InstallCollections(t *testing.T) {
 				svc.On("Update", mock.Anything, &collections.Collection{ID: "1", SpaceID: "sp", EnvID: "env", View: &collections.View{SpaceID: "sp3", EnvID: environments.DefaultEnvironment, CollectionID: "3"}}).Return(nil).Once()
 			},
 			envsCall: func(svc *envmocks.Environments) {
-				svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(nil).Once()
+				svc.On("Migrate", mock.Anything, "sp", "env").Return(nil).Once()
 			},
 			wantErr: func(t *testing.T, err error) {
 				assert.NoError(t, err)
@@ -189,7 +189,7 @@ func TestSetup_InstallCollections(t *testing.T) {
 				svc.On("SetSchema", mock.Anything, "sp", "env", "1", schema.New("name", field.String())).Return(nil).Once()
 			},
 			envsCall: func(svc *envmocks.Environments) {
-				svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(errors.New("migrate error")).Once()
+				svc.On("Migrate", mock.Anything, "sp", "env").Return(errors.New("migrate error")).Once()
 			},
 			wantErr: func(t *testing.T, err error) {
 				assert.Error(t, err)