Adding restoration of the keychains as a build wrapper