E2E Self-Heal