Updated webhook plus fixed template variables