Made some mode adjustments to the upstream provider templates