diff --git a/bazel/foreign_cc/BUILD b/bazel/foreign_cc/BUILD
index c4a59ab20bda..09a59c586964 100644
--- a/bazel/foreign_cc/BUILD
+++ b/bazel/foreign_cc/BUILD
@@ -211,22 +211,6 @@ envoy_cmake_external(
     }),
 )
 
-envoy_cmake_external(
-    name = "yaml",
-    cache_entries = {
-        "YAML_CPP_BUILD_TESTS": "off",
-        "YAML_CPP_BUILD_TOOLS": "off",
-        "YAML_BUILD_SHARED_LIBS": "off",
-        "CMAKE_CXX_COMPILER_FORCED": "on",
-        "YAML_MSVC_SHARED_RT": "off",
-    },
-    lib_source = "@com_github_jbeder_yaml_cpp//:all",
-    static_libraries = select({
-        "//bazel:windows_x86_64": ["yaml-cpp.lib"],
-        "//conditions:default": ["libyaml-cpp.a"],
-    }),
-)
-
 envoy_cmake_external(
     name = "zlib",
     cache_entries = {
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 4e0293ef288b..ee59f5564a78 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -339,15 +339,12 @@ def _com_github_google_libprotobuf_mutator():
     )
 
 def _com_github_jbeder_yaml_cpp():
-    location = _get_location("com_github_jbeder_yaml_cpp")
-    http_archive(
+    _repository_impl(
         name = "com_github_jbeder_yaml_cpp",
-        build_file_content = BUILD_ALL_CONTENT,
-        **location
     )
     native.bind(
         name = "yaml_cpp",
-        actual = "@envoy//bazel/foreign_cc:yaml",
+        actual = "@com_github_jbeder_yaml_cpp//:yaml-cpp",
     )
 
 def _com_github_libevent_libevent():
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index 11cf908a21c0..07cce0b5698e 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -265,7 +265,7 @@ DEPENDENCY_REPOSITORIES = dict(
         sha256 = "79ab7069ef1c7c3632e7ffe095f7185d4c77b64d8035db3c085c239d4fe96d5f",
         strip_prefix = "yaml-cpp-98acc5a8874faab28b82c28936f4b400b389f5d6",
         # 2020-07-28
-        urls = ["https://github.com/greenhouse-org/yaml-cpp/archive/98acc5a8874faab28b82c28936f4b400b389f5d6.tar.gz"],
+        urls = ["https://github.com/jbeder/yaml-cpp/archive/98acc5a8874faab28b82c28936f4b400b389f5d6.tar.gz"],
         use_category = ["dataplane"],
         cpe = "N/A",
     ),