Updated release script for new templates
CWD fix