Closes https://gitlab.com/charts/gitlab/issues/1140 and https://gitlab.com/charts/gitlab/issues/1142.