diff --git a/.changelog/10588.txt b/.changelog/10588.txt
new file mode 100644
index 000000000..20ed86e71
--- /dev/null
+++ b/.changelog/10588.txt
@@ -0,0 +1,4 @@
+```release-note:deprecation
+config: the `ports.grpc` and `addresses.grpc` configuration settings have been renamed to `ports.xds` and `addresses.xds` to better match their function.
+```
+
diff --git a/agent/agent_endpoint.go b/agent/agent_endpoint.go
index 7b06875d7..37126761d 100644
--- a/agent/agent_endpoint.go
+++ b/agent/agent_endpoint.go
@@ -93,9 +93,14 @@ func (s *HTTPHandlers) AgentSelf(resp http.ResponseWriter, req *http.Request) (i
 		Server:            s.agent.config.ServerMode,
 		Version:           s.agent.config.Version,
 	}
+	debugConfig := s.agent.config.Sanitized()
+	// Backwards compat for the envoy command. Never use DebugConfig for
+	// programmatic access to data.
+	debugConfig["GRPCPort"] = s.agent.config.XDSPort
+
 	return Self{
 		Config:      config,
-		DebugConfig: s.agent.config.Sanitized(),
+		DebugConfig: debugConfig,
 		Coord:       cs[s.agent.config.SegmentName],
 		Member:      s.agent.LocalMember(),
 		Stats:       s.agent.Stats(),