diff --git a/repositories.bzl b/repositories.bzl
index 5860e1fee7b..bb9170a842b 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -84,10 +84,10 @@ IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS = {
     "io.grpc:grpc-protobuf": "@io_grpc_grpc_java//protobuf",
     "io.grpc:grpc-protobuf-lite": "@io_grpc_grpc_java//protobuf-lite",
     "io.grpc:grpc-rls": "@io_grpc_grpc_java//rls",
-    "io.grpc:grpc-services": "@io_grpc_grpc_java//services",
+    "io.grpc:grpc-services": "@io_grpc_grpc_java//services:services_maven",
     "io.grpc:grpc-stub": "@io_grpc_grpc_java//stub",
     "io.grpc:grpc-testing": "@io_grpc_grpc_java//testing",
-    "io.grpc:grpc-xds": "@io_grpc_grpc_java//xds",
+    "io.grpc:grpc-xds": "@io_grpc_grpc_java//xds:xds_maven",
 }
 
 def grpc_java_repositories():
diff --git a/xds/BUILD.bazel b/xds/BUILD.bazel
index fb1126e8494..6e228e636be 100644
--- a/xds/BUILD.bazel
+++ b/xds/BUILD.bazel
@@ -6,6 +6,7 @@ load("//:java_grpc_library.bzl", "java_grpc_library")
 # Maven Central.
 java_library(
     name = "xds_maven",
+    visibility = ["//visibility:public"],
     runtime_deps = [
         ":orca",
         ":xds",