diff --git a/server/rpc_server.go b/server/rpc_server.go
index 14e035d7..afff0466 100644
--- a/server/rpc_server.go
+++ b/server/rpc_server.go
@@ -192,6 +192,8 @@ func (s *rpcServer) Register() error {
 	}
 
 	node.Metadata["transport"] = config.Transport.String()
+	node.Metadata["broker"] = config.Broker.String()
+	node.Metadata["server"] = s.String()
 
 	s.RLock()
 	var endpoints []*registry.Endpoint