Fix sonar issues & modify deploy property