Fix deutschetelekom template
Merge remote-tracking branch 'origin/template_fixes'