Improve idempotence on re-provision