WIP - move staging templates into cf-release