diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index e1581c2937537..cdfef219e39c5 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -112,13 +112,13 @@ def envoy_api_deps(skip_targets):
     native.git_repository(
         name = "envoy_api",
         remote = REPO_LOCATIONS["envoy_api"],
-        commit = "2ece56b705813e1a7176ceb73abf4fb67563f676",
+        commit = "9be6aff6da46e024af56cce20cb5d5d3184f19c5",
     )
     api_bind_targets = [
         "address",
-        "ads",
         "base",
         "bootstrap",
+        "discovery",
         "cds",
         "eds",
         "health_check",
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index 0458270a718d7..a79123ab2b48b 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -1,7 +1,7 @@
 REPO_LOCATIONS = {
     "jinja2": "https://github.com/pallets/jinja.git",
     "grpc_transcoding": "https://github.com/grpc-ecosystem/grpc-httpjson-transcoding.git",
-    "envoy_api": "https://github.com/lyft/envoy-api.git",
+    "envoy_api": "https://github.com/envoyproxy/data-plane-api.git",
     "protobuf" :"https://github.com/htuch/protobuf.git",
     "markupsafe": "https://github.com/pallets/markupsafe.git",
 }
diff --git a/source/common/config/BUILD b/source/common/config/BUILD
index f880c75e07407..feac39d0f8fc7 100644
--- a/source/common/config/BUILD
+++ b/source/common/config/BUILD
@@ -23,7 +23,7 @@ envoy_cc_library(
 envoy_cc_library(
     name = "ads_api_lib",
     hdrs = ["ads_api_impl.h"],
-    external_deps = ["envoy_ads"],
+    external_deps = ["envoy_discovery"],
     deps = [
         "//include/envoy/config:ads_interface",
         "//include/envoy/config:subscription_interface",
@@ -34,7 +34,7 @@ envoy_cc_library(
 envoy_cc_library(
     name = "ads_subscription_lib",
     hdrs = ["ads_subscription_impl.h"],
-    external_deps = ["envoy_ads"],
+    external_deps = ["envoy_discovery"],
     deps = [
         "//include/envoy/config:ads_interface",
         "//include/envoy/config:subscription_interface",
diff --git a/source/common/config/ads_api_impl.h b/source/common/config/ads_api_impl.h
index 01f6bc85d8cf2..1c2aacfc8cb77 100644
--- a/source/common/config/ads_api_impl.h
+++ b/source/common/config/ads_api_impl.h
@@ -6,7 +6,7 @@
 
 #include "common/common/logger.h"
 
-#include "api/ads.pb.h"
+#include "api/discovery.pb.h"
 
 namespace Envoy {
 namespace Config {
diff --git a/source/common/config/ads_subscription_impl.h b/source/common/config/ads_subscription_impl.h
index 22aaf6ae9f5c8..b1e0828c12bec 100644
--- a/source/common/config/ads_subscription_impl.h
+++ b/source/common/config/ads_subscription_impl.h
@@ -8,7 +8,7 @@
 #include "common/grpc/common.h"
 #include "common/protobuf/protobuf.h"
 
-#include "api/ads.pb.h"
+#include "api/discovery.pb.h"
 
 namespace Envoy {
 namespace Config {