[Gnso-ppsai-pdp-wg] Updated templates for D-2, D-3 & D-4