Joachim Low has confirmed that Manuel Neuer and Marc-Andre ter Stegen will play a game each for Germany during this month's internationals against Argentina and Estonia.
The two keepers have been embroiled in a public spat over the last month following Ter Stegen's anger at not being picked for a qualifier against Northern Ireland.
Neuer responded by branding the Barcelona keeper unprofessional, setting in motion a war of words between the two camps.
Speaking to the Daily Mail about the issue after announcing the Germany squad, Low said: "Together with [goalkeeper coach] Andreas Kopke, we've decided that Marc will play in Dortmund and Manu in Tallinn. We've discussed it with both players.
"I have confirmed numerous times that Manuel Neuer is our captain and our number one regarding the European Championship – so long as nothing extraordinary happens."
Bayern Munich president Uli Hoeness has responded to the row by threatening to boycott the use of any Bayern players in the national team.
Neuer, who is now 33, will most likely play in his last major tournament next year, with reports suggesting that the German is considering retirement from international football.
Germany
Switzerland
Hungary
Scotland
Spain
Italy
Croatia
Albania
England
Denmark
Slovenia
Serbia
Austria
France
Netherlands
Poland
Romania
Belgium
Slovakia
Ukraine
Portugal
Turkey
Georgia
Czech Republic