Updated templates and deployment