use proper *_SERVICE_PORT for service env var
more fixing service port env var names