Cherry-pick from branch 'feature/8547-common-helm-integration' into 'azure/m12-master'

Fixed the retry attempts in the value files

See merge request !431 (merged)