diff --git a/xds/src/main/java/io/grpc/xds/XdsComms.java b/xds/src/main/java/io/grpc/xds/XdsComms.java
index ca5f1b4454..57cf24e4cc 100644
--- a/xds/src/main/java/io/grpc/xds/XdsComms.java
+++ b/xds/src/main/java/io/grpc/xds/XdsComms.java
@@ -344,14 +344,12 @@ final class XdsComms {
           DiscoveryRequest.newBuilder()
               .setNode(Node.newBuilder()
                   .setMetadata(Struct.newBuilder()
-                      .putFields(
-                          TRAFFICDIRECTOR_GRPC_HOSTNAME,
-                          Value.newBuilder().setStringValue(helper.getAuthority())
-                              .build())
                       .putFields(
                           "endpoints_required",
                           Value.newBuilder().setBoolValue(true).build())))
-              .setTypeUrl(EDS_TYPE_URL).build();
+              .setTypeUrl(EDS_TYPE_URL)
+              // In the future, the right resource name can be obtained from CDS response.
+              .addResourceNames(helper.getAuthority()).build();
       helper.getChannelLogger().log(ChannelLogLevel.DEBUG, "Sending EDS request {0}", edsRequest);
       xdsRequestWriter.onNext(edsRequest);
     }
diff --git a/xds/src/test/java/io/grpc/xds/XdsCommsTest.java b/xds/src/test/java/io/grpc/xds/XdsCommsTest.java
index 8e35a75f73..c69e689ebc 100644
--- a/xds/src/test/java/io/grpc/xds/XdsCommsTest.java
+++ b/xds/src/test/java/io/grpc/xds/XdsCommsTest.java
@@ -223,6 +223,7 @@ public class XdsCommsTest {
     assertThat(
             request.getNode().getMetadata().getFieldsOrThrow("endpoints_required").getBoolValue())
         .isTrue();
+    assertThat(request.getResourceNamesList()).hasSize(1);
 
     Locality localityProto1 = Locality.newBuilder()
         .setRegion("region1").setZone("zone1").setSubZone("subzone1").build();