diff --git a/BUILD b/BUILD
index 044bc7d1..d61c9e48 100644
--- a/BUILD
+++ b/BUILD
@@ -58,6 +58,7 @@ proto_library(
     visibility = ["//visibility:public"],
     deps = [
         "//contrib/envoy/extensions/filters/http/squash/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg",
         "//envoy/admin/v3:pkg",
         "//envoy/config/accesslog/v3:pkg",
         "//envoy/config/bootstrap/v3:pkg",
@@ -159,7 +160,6 @@ proto_library(
         "//envoy/extensions/filters/network/echo/v3:pkg",
         "//envoy/extensions/filters/network/ext_authz/v3:pkg",
         "//envoy/extensions/filters/network/http_connection_manager/v3:pkg",
-        "//envoy/extensions/filters/network/kafka_broker/v3:pkg",
         "//envoy/extensions/filters/network/local_ratelimit/v3:pkg",
         "//envoy/extensions/filters/network/mongo_proxy/v3:pkg",
         "//envoy/extensions/filters/network/mysql_proxy/v3:pkg",
diff --git a/envoy/extensions/filters/network/kafka_broker/v3/BUILD b/contrib/envoy/extensions/filters/network/kafka_broker/v3/BUILD
similarity index 100%
rename from envoy/extensions/filters/network/kafka_broker/v3/BUILD
rename to contrib/envoy/extensions/filters/network/kafka_broker/v3/BUILD
diff --git a/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto b/contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto
similarity index 100%
rename from envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto
rename to contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto
diff --git a/versioning/BUILD b/versioning/BUILD
index 33e48b64..de813567 100644
--- a/versioning/BUILD
+++ b/versioning/BUILD
@@ -10,6 +10,7 @@ proto_library(
     visibility = ["//visibility:public"],
     deps = [
         "//contrib/envoy/extensions/filters/http/squash/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg",
         "//envoy/admin/v3:pkg",
         "//envoy/config/accesslog/v3:pkg",
         "//envoy/config/bootstrap/v3:pkg",
@@ -111,7 +112,6 @@ proto_library(
         "//envoy/extensions/filters/network/echo/v3:pkg",
         "//envoy/extensions/filters/network/ext_authz/v3:pkg",
         "//envoy/extensions/filters/network/http_connection_manager/v3:pkg",
-        "//envoy/extensions/filters/network/kafka_broker/v3:pkg",
         "//envoy/extensions/filters/network/local_ratelimit/v3:pkg",
         "//envoy/extensions/filters/network/mongo_proxy/v3:pkg",
         "//envoy/extensions/filters/network/mysql_proxy/v3:pkg",