Port changes for enterprise

Seems to be working fine on org staging, pro staging and enterprise.