Manchester City have been handed a timely injury boost for their Champions League push, with Rodri and Erling Haaland back in training.