PNPM ci improvements (#3173)