Updated configuration templates