Merge "[HELM] Clean up and fix oom helm jobs"