Another attempt at getting the port right for prod