APOLLO-1175 Updated team validator