GUI-337: Add instance type choices to conditions