Address CI failures

Damus: v1.17 (1328) This is a placeholder issue to look into CI failures and address them so that we have a stable, clean, and robust CI.