Removed hardcoded hostname suffix