fix(sca): Kustomize and Helm improvements (#7568)