Dry jenkins

Change file naming to include the target infra in prop file names for pattern matching on Jenkins