Remove hardcoding hostname for group