Option 2 may be simplified by the result of this thread: Should we have a dedicated repo for infrastructure?