AWS Production Connectivity Fix