Fixing pipeline checks, updating template