Move identical configuration blocks into separate vars as they are unlikely to be different for two streams