Once T2442 is fully implemented, we should update listers to make use of this new API.
This has all been landed during the sprint at the beginning of 2021.
This task has been migrated to GitLab.