Remove the port override
Add a user for the diamond user