This commit depends on https://gitlab.cern.ch/helm/charts/cern/-/merge_requests/67/diffs#8dd99b951e8eb9f45a48e6b77882ed387d9a541b