Refactor key uploads/deletes to happen before Kitchen config is generated