finish agent and policy new templates