Use environment variables
Update port details
Clean up