Fixed image and templates task dependencies for build