CFY-1308 added special case for ubuntu agents