Updated cluster to use namespace instead of template tags.