[V2] Quickstarts improvements