Updated setup for CI