Renewed Fleet and Infrastructure Enhancements in Attica and Thessaloniki by 2025