Because of https://its.cern.ch/jira/browse/SIGMON-358 we are noe deploying following recommendations from Cristian