diff --git a/config/ModulesMapping.jsonc b/config/ModulesMapping.jsonc
index a085e1628a..6d2635e07c 100644
--- a/config/ModulesMapping.jsonc
+++ b/config/ModulesMapping.jsonc
@@ -26,7 +26,7 @@
   "Identity.Partner": "^tenantRelationships.delegatedAdminRelationship$|^tenantRelationships.delegatedAdminCustomer$",
   "Mail": "^users.inferenceClassification$|^users.mailFolder$|^users.message$",
   "ManagedTenants": "^tenantRelationships.managedTenant$",
-  "Migrations": "^solutions.migrations",
+  "Migrations": "^solutions.migrationsRoot",
   "NetworkAccess": "^networkAccess\\.",
   "Notes": "^users.onenote$|^groups.onenote$|^sites.onenote$",
   "People": "^users.person$|^users.profile$|^users.officeGraphInsights$|^users.userAnalytics$",
diff --git a/src/Migrations/Migrations.md b/src/Migrations/Migrations.md
index 8622132fa4..302a83883c 100644
--- a/src/Migrations/Migrations.md
+++ b/src/Migrations/Migrations.md
@@ -17,4 +17,25 @@ require:
 
 ``` yaml
 # Directives go here!
+
+# Rename commands with 'SolutionMigrationCrossTenantMigrationJob<x>' to 'CrossTenantMigrationJob<x>'
+directive:
+  - where:
+      subject: (^SolutionMigrationCrossTenantMigrationJob)(.*)
+    set:
+      subject: CrossTenantMigrationJob$2
+# Remove all the 'DisplayName','SolutionMigration', and 'Count' commands, they are redundant/unsupported
+  - where:
+      subject: (DisplayName$|SolutionMigration$|Count$)
+    remove: true
+# Remove extra 'Remove' commands, only jobs can be removed
+  - where:
+      verb: Remove
+      subject: CrossTenantMigrationJob.+$
+    remove: true
+# Remove New/Update-CrossTenantMigrationJobUser, they are not supported operations
+  - where:
+      verb: (New|Update)
+      subject: CrossTenantMigrationJobUser$
+    remove: true
 ```