Related to https://gitlab.com/charts/gitlab/merge_requests/296
Towards https://gitlab.com/charts/gitlab/issues/41