Merge "[AAI] Make AAI helm3 compatible"