Use project_id instead of tenant