Fix port conflicts pt1

Description:

Fix port conflicts pt1