Removing hardcoded AWS hostname