Remove hardcoding host-name in group