diff --git a/.env b/.env
index 5ddc3e4ad2..59a801f052 100644
--- a/.env
+++ b/.env
@@ -53,6 +53,10 @@ FEATURE_FLAG_GRPC_SERVICE_ADDR=featureflagservice:${FEATURE_FLAG_GRPC_SERVICE_PO
 FRONTEND_PORT=8080
 FRONTEND_ADDR=frontend:${FRONTEND_PORT}
 
+# Nginx Proxy
+NGINX_PORT=90
+NGINX_ADDR=nginx:${FRONTEND_PORT}
+
 # Frontend Proxy (Envoy)
 FRONTEND_HOST=frontend
 ENVOY_PORT=8080
diff --git a/docker-compose.yml b/docker-compose.yml
index 1a8c4968fe..777cc3b219 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -620,6 +620,7 @@ services:
 
   jaeger-agent:
     image: jaegertracing/jaeger-agent:latest
+    container_name: jaeger-agent
     hostname: jaeger-agent
     command: ["--reporter.grpc.host-port=jaeger:14250"]
     ports: