Align with https://gitlab.cern.ch/ai-config-team/ai-tools/-/commit/df3e5b9bdba39f59337bfd8c3dea76b22c244fe0 changes
CC @straylen