Continued from user MR https://gitlab.com/charts/gitlab/merge_requests/509
Closes https://gitlab.com/charts/gitlab/issues/705