Merge "Improve oran_oom helm charts"