Merge "[OOM] Fix helm3.x job generation"