Fix sonar issues & modify deploy property

No match.