diff --git a/packages/twenty-server/src/database/commands/database-command.module.ts b/packages/twenty-server/src/database/commands/database-command.module.ts
index 7cee4179c..eaaaa8624 100644
--- a/packages/twenty-server/src/database/commands/database-command.module.ts
+++ b/packages/twenty-server/src/database/commands/database-command.module.ts
@@ -1,16 +1,13 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
-import { AddNewAddressFieldToViewsWithDeprecatedAddressFieldCommand } from 'src/database/commands/0-22-add-new-address-field-to-views-with-deprecated-address.command';
-import { UpdateMessageChannelSyncStageEnumCommand } from 'src/database/commands/0-22-update-message-channel-sync-stage-enum.command';
-import { UpdateMessageChannelSyncStatusEnumCommand } from 'src/database/commands/0-22-update-message-channel-sync-status-enum.command';
 import { StartDataSeedDemoWorkspaceCronCommand } from 'src/database/commands/data-seed-demo-workspace/crons/start-data-seed-demo-workspace.cron.command';
 import { StopDataSeedDemoWorkspaceCronCommand } from 'src/database/commands/data-seed-demo-workspace/crons/stop-data-seed-demo-workspace.cron.command';
 import { DataSeedDemoWorkspaceCommand } from 'src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace-command';
 import { DataSeedDemoWorkspaceModule } from 'src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace.module';
 import { DataSeedWorkspaceCommand } from 'src/database/commands/data-seed-dev-workspace.command';
 import { ConfirmationQuestion } from 'src/database/commands/questions/confirmation.question';
-import { UpdateMessageChannelVisibilityEnumCommand } from 'src/database/commands/update-message-channel-visibility-enum.command';
+import { UpdateMessageChannelVisibilityEnumCommand } from 'src/database/commands/upgrade-version/0-20/0-20-update-message-channel-visibility-enum.command';
 import { UpgradeTo0_22CommandModule } from 'src/database/commands/upgrade-version/0-22/0-22-upgrade-version.module';
 import { WorkspaceAddTotalCountCommand } from 'src/database/commands/workspace-add-total-count.command';
 import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
@@ -59,9 +56,6 @@ import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/worksp
     StartDataSeedDemoWorkspaceCronCommand,
     StopDataSeedDemoWorkspaceCronCommand,
     UpdateMessageChannelVisibilityEnumCommand,
-    UpdateMessageChannelSyncStatusEnumCommand,
-    UpdateMessageChannelSyncStageEnumCommand,
-    AddNewAddressFieldToViewsWithDeprecatedAddressFieldCommand,
   ],
 })
 export class DatabaseCommandModule {}
diff --git a/packages/twenty-server/src/database/commands/update-message-channel-visibility-enum.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-20/0-20-update-message-channel-visibility-enum.command.ts
similarity index 100%
rename from packages/twenty-server/src/database/commands/update-message-channel-visibility-enum.command.ts
rename to packages/twenty-server/src/database/commands/upgrade-version/0-20/0-20-update-message-channel-visibility-enum.command.ts
diff --git a/packages/twenty-server/src/database/commands/0-22-add-new-address-field-to-views-with-deprecated-address.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-22/0-22-add-new-address-field-to-views-with-deprecated-address.command.ts
similarity index 100%
rename from packages/twenty-server/src/database/commands/0-22-add-new-address-field-to-views-with-deprecated-address.command.ts
rename to packages/twenty-server/src/database/commands/upgrade-version/0-22/0-22-add-new-address-field-to-views-with-deprecated-address.command.ts
diff --git a/packages/twenty-server/src/database/commands/0-22-update-message-channel-sync-stage-enum.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-22/0-22-update-message-channel-sync-stage-enum.command.ts
similarity index 100%
rename from packages/twenty-server/src/database/commands/0-22-update-message-channel-sync-stage-enum.command.ts
rename to packages/twenty-server/src/database/commands/upgrade-version/0-22/0-22-update-message-channel-sync-stage-enum.command.ts
diff --git a/packages/twenty-server/src/database/commands/0-22-update-message-channel-sync-status-enum.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-22/0-22-update-message-channel-sync-status-enum.command.ts
similarity index 100%
rename from packages/twenty-server/src/database/commands/0-22-update-message-channel-sync-status-enum.command.ts
rename to packages/twenty-server/src/database/commands/upgrade-version/0-22/0-22-update-message-channel-sync-status-enum.command.ts
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-22/0-22-upgrade-version.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-22/0-22-upgrade-version.command.ts
index ff6e3a68b..f42b3fd39 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-22/0-22-upgrade-version.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-22/0-22-upgrade-version.command.ts
@@ -1,7 +1,10 @@
 import { Command, CommandRunner, Option } from 'nest-commander';
 
+import { AddNewAddressFieldToViewsWithDeprecatedAddressFieldCommand } from 'src/database/commands/upgrade-version/0-22/0-22-add-new-address-field-to-views-with-deprecated-address.command';
 import { FixObjectMetadataIdStandardIdCommand } from 'src/database/commands/upgrade-version/0-22/0-22-fix-object-metadata-id-standard-id.command';
 import { UpdateBooleanFieldsNullDefaultValuesAndNullValuesCommand } from 'src/database/commands/upgrade-version/0-22/0-22-update-boolean-fields-null-default-values-and-null-values.command';
+import { UpdateMessageChannelSyncStageEnumCommand } from 'src/database/commands/upgrade-version/0-22/0-22-update-message-channel-sync-stage-enum.command';
+import { UpdateMessageChannelSyncStatusEnumCommand } from 'src/database/commands/upgrade-version/0-22/0-22-update-message-channel-sync-status-enum.command';
 
 interface UpdateBooleanFieldsNullDefaultValuesAndNullValuesCommandOptions {
   workspaceId?: string;
@@ -15,6 +18,9 @@ export class UpgradeTo0_22Command extends CommandRunner {
   constructor(
     private readonly fixObjectMetadataIdStandardIdCommand: FixObjectMetadataIdStandardIdCommand,
     private readonly updateBooleanFieldsNullDefaultValuesAndNullValuesCommand: UpdateBooleanFieldsNullDefaultValuesAndNullValuesCommand,
+    private readonly addNewAddressFieldToViewsWithDeprecatedAddressFieldCommand: AddNewAddressFieldToViewsWithDeprecatedAddressFieldCommand,
+    private readonly updateMessageChannelSyncStatusEnumCommand: UpdateMessageChannelSyncStatusEnumCommand,
+    private readonly updateMessageChannelSyncStageEnumCommand: UpdateMessageChannelSyncStageEnumCommand,
   ) {
     super();
   }
@@ -37,5 +43,17 @@ export class UpgradeTo0_22Command extends CommandRunner {
       _passedParam,
       options,
     );
+    await this.addNewAddressFieldToViewsWithDeprecatedAddressFieldCommand.run(
+      _passedParam,
+      options,
+    );
+    await this.updateMessageChannelSyncStatusEnumCommand.run(
+      _passedParam,
+      options,
+    );
+    await this.updateMessageChannelSyncStageEnumCommand.run(
+      _passedParam,
+      options,
+    );
   }
 }
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-22/0-22-upgrade-version.module.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-22/0-22-upgrade-version.module.ts
index 0bd19bff7..898f720bd 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-22/0-22-upgrade-version.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-22/0-22-upgrade-version.module.ts
@@ -1,24 +1,55 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
+import { DataSeedDemoWorkspaceModule } from 'src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace.module';
+import { AddNewAddressFieldToViewsWithDeprecatedAddressFieldCommand } from 'src/database/commands/upgrade-version/0-22/0-22-add-new-address-field-to-views-with-deprecated-address.command';
 import { FixObjectMetadataIdStandardIdCommand } from 'src/database/commands/upgrade-version/0-22/0-22-fix-object-metadata-id-standard-id.command';
 import { UpdateBooleanFieldsNullDefaultValuesAndNullValuesCommand } from 'src/database/commands/upgrade-version/0-22/0-22-update-boolean-fields-null-default-values-and-null-values.command';
+import { UpdateMessageChannelSyncStageEnumCommand } from 'src/database/commands/upgrade-version/0-22/0-22-update-message-channel-sync-stage-enum.command';
+import { UpdateMessageChannelSyncStatusEnumCommand } from 'src/database/commands/upgrade-version/0-22/0-22-update-message-channel-sync-status-enum.command';
 import { UpgradeTo0_22Command } from 'src/database/commands/upgrade-version/0-22/0-22-upgrade-version.command';
 import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
+import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.module';
 import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
 import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
+import { WorkspaceStatusModule } from 'src/engine/workspace-manager/workspace-status/workspace-manager.module';
+import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module';
 
 @Module({
   imports: [
-    TypeOrmModule.forFeature([Workspace], 'core'),
-    WorkspaceCacheVersionModule,
-    TypeORMModule,
+    WorkspaceManagerModule,
     DataSourceModule,
+    TypeORMModule,
+    TypeOrmModule.forFeature(
+      [Workspace, BillingSubscription, FeatureFlagEntity],
+      'core',
+    ),
+    TypeOrmModule.forFeature(
+      [FieldMetadataEntity, ObjectMetadataEntity],
+      'metadata',
+    ),
+    WorkspaceModule,
+    WorkspaceDataSourceModule,
+    WorkspaceSyncMetadataModule,
+    WorkspaceStatusModule,
+    ObjectMetadataModule,
+    DataSeedDemoWorkspaceModule,
+    WorkspaceCacheVersionModule,
   ],
   providers: [
     FixObjectMetadataIdStandardIdCommand,
     UpdateBooleanFieldsNullDefaultValuesAndNullValuesCommand,
+    UpdateMessageChannelSyncStatusEnumCommand,
+    UpdateMessageChannelSyncStageEnumCommand,
+    AddNewAddressFieldToViewsWithDeprecatedAddressFieldCommand,
     UpgradeTo0_22Command,
   ],
 })