Remove hardcoded hostname