Adjust Recovery keys after upstream CM changes