diff --git a/cdsmcp/AGENTS.md b/cdsmcp/AGENTS.md
index f5975d5..adafdf1 100644
--- a/cdsmcp/AGENTS.md
+++ b/cdsmcp/AGENTS.md
@@ -28,6 +28,7 @@ This folder contains the VMware/vCenter + MigrateOps runbook for CDS MCP workflo
 ## Required Run Pattern
 1. Confirm source VM in vCenter and power state before IP/SSH actions.
 2. Prepare source host (CDC cleanup + CMC reinstall/registration) and verify source is connected in CDC.
+   This applies to Windows sources too; do not skip project cleanup just because SSH + PowerShell works.
 3. Validate preflight requirements from `docs/vmware-migrateops-guide.md`.
 4. Create MigrateOps from `templates/vmw.yaml` with request-specific replacements.
 5. Monitor continuously and auto-approve cutover unless the user requests manual approval.
diff --git a/cdsmcp/docs/cmc-install-reference.md b/cdsmcp/docs/cmc-install-reference.md
index 3fb4121..2c69d53 100644
--- a/cdsmcp/docs/cmc-install-reference.md
+++ b/cdsmcp/docs/cmc-install-reference.md
@@ -23,9 +23,11 @@ iex "& { $(irm https://get.cirrusdata.cloud/install-cmc-win) } -rgc $env:CMC_GCS
 ```
 
 ## Windows Reinstall Pattern
+- Before install or reinstall, clean stale CDC project state for that machine when applicable instead of blindly reusing an existing registration.
 - Before install or reinstall, connect over SSH with `ATVM_WINDOWS_TARGET_USER` and `ATVM_WINDOWS_TARGET_PASSWORD`.
 - Check whether CMC is already installed before deciding on the next action.
 - If CMC is already installed, uninstall first, then run the Windows install command again.
+- After cleanup/reinstall, verify the host shows up as a fresh connected system in the CDC project before creating migrations.
 - Use the same registration code and endpoint defaults as the Linux flow.
 - Prefer direct SSH + PowerShell execution for both the install and uninstall commands.
 
diff --git a/cdsmcp/docs/vmware-migrateops-guide.md b/cdsmcp/docs/vmware-migrateops-guide.md
index 6720dba..fdc40b4 100644
--- a/cdsmcp/docs/vmware-migrateops-guide.md
+++ b/cdsmcp/docs/vmware-migrateops-guide.md
@@ -68,8 +68,10 @@ This file is for workflow guidance only. Do not add specific run examples here.
 ## CMC Preparation Rule
 - For Linux sources, use the Linux SSH credential path and the Linux install/uninstall reference.
 - For Windows sources, use SSH to the guest with `ATVM_WINDOWS_TARGET_USER` and `ATVM_WINDOWS_TARGET_PASSWORD`.
+- For both Linux and Windows, clean stale CDC project state for that machine before reinstalling CMC unless the operator explicitly wants to reuse the existing registration.
 - For Windows sources, check whether CMC is already installed before install.
 - If Windows CMC is already present, uninstall first and then reinstall using the Windows PowerShell installer command.
+- After reinstall on Windows, confirm the host reconnects in the CDC project as expected before creating local or remote migration sessions.
 - Do not treat VMware guest operations as the default Windows execution path.
 
 ## Post-Migration Validation and Cleanup Pattern