Should be merged after !551 (merged) and https://gitlab.com/charts/gitlab/merge_requests/699 are merged.