[beta] More cirrus config updates

Change-Id: I540aaaedea9d482dd844a1a74ed057e1be3c16e9
Merge "[beta] More cirrus config updates"