diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 85f49c528d5d..26b648c66084 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -12,7 +12,7 @@ updates:
     interval: "daily"
 
 - package-ecosystem: "pip"
-  directory: "/source/extensions/filters/network/kafka"
+  directory: "/contrib/kafka/filters/network/source"
   schedule:
     interval: "daily"
 
diff --git a/CODEOWNERS b/CODEOWNERS
index 47d9ddfcee11..e0e1c5a593b6 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -198,9 +198,8 @@ extensions/filters/http/oauth2 @rgs1 @derekargueta @snowp
 /*/extensions/formatter/req_without_query @dio @tsaarni
 # IP address input matcher
 /*/extensions/matching/input_matchers/ip @aguinet @snowp
-# Kafka
-/*/extensions/filters/network/kafka @mattklein123 @adamkotwasinski
 
 # Contrib
 /contrib/exe/ @mattklein123 @lizan
 /contrib/squash/ @yuval-k @alyssawilk
+/contrib/kafka/ @mattklein123 @adamkotwasinski
diff --git a/api/BUILD b/api/BUILD
index 044bc7d137a8..d61c9e486b81 100644
--- a/api/BUILD
+++ b/api/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/api/envoy/extensions/filters/network/kafka_broker/v3/BUILD b/api/contrib/envoy/extensions/filters/network/kafka_broker/v3/BUILD
similarity index 100%
rename from api/envoy/extensions/filters/network/kafka_broker/v3/BUILD
rename to api/contrib/envoy/extensions/filters/network/kafka_broker/v3/BUILD
diff --git a/api/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto b/api/contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto
similarity index 100%
rename from api/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto
rename to api/contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto
diff --git a/api/versioning/BUILD b/api/versioning/BUILD
index 33e48b6488fa..de8135674d21 100644
--- a/api/versioning/BUILD
+++ b/api/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",
diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl
index e04a4ac41d7a..8b793c82ec8c 100644
--- a/bazel/repositories_extra.bzl
+++ b/bazel/repositories_extra.bzl
@@ -69,7 +69,7 @@ def _python_deps():
     )
     pip_install(
         name = "kafka_pip3",
-        requirements = "@envoy//source/extensions/filters/network/kafka:requirements.txt",
+        requirements = "@envoy//contrib/kafka/filters/network/source:requirements.txt",
         extra_pip_args = ["--require-hashes"],
 
         # project_name = "Jinja",
diff --git a/contrib/contrib_build_config.bzl b/contrib/contrib_build_config.bzl
index 9c51607746a1..da72332be361 100644
--- a/contrib/contrib_build_config.bzl
+++ b/contrib/contrib_build_config.bzl
@@ -5,4 +5,10 @@ CONTRIB_EXTENSIONS = {
     #
 
     "envoy.filters.http.squash":                        "//contrib/squash/filters/http/source:config",
+
+    #
+    # Network filters
+    #
+
+    "envoy.filters.network.kafka_broker":                         "//contrib/kafka/filters/network/source:kafka_broker_config_lib",
 }
diff --git a/contrib/extensions_metadata.yaml b/contrib/extensions_metadata.yaml
index d841fc7d5f73..76e01821520c 100644
--- a/contrib/extensions_metadata.yaml
+++ b/contrib/extensions_metadata.yaml
@@ -3,3 +3,8 @@ envoy.filters.http.squash:
   - envoy.filters.http
   security_posture: requires_trusted_downstream_and_upstream
   status: stable
+envoy.filters.network.kafka_broker:
+  categories:
+  - envoy.filters.network
+  security_posture: requires_trusted_downstream_and_upstream
+  status: wip
diff --git a/source/extensions/filters/network/kafka/BUILD b/contrib/kafka/filters/network/source/BUILD
similarity index 96%
rename from source/extensions/filters/network/kafka/BUILD
rename to contrib/kafka/filters/network/source/BUILD
index a6f2677a6075..ec196b5e9abe 100644
--- a/source/extensions/filters/network/kafka/BUILD
+++ b/contrib/kafka/filters/network/source/BUILD
@@ -1,20 +1,20 @@
 load(
     "//bazel:envoy_build_system.bzl",
-    "envoy_cc_extension",
+    "envoy_cc_contrib_extension",
     "envoy_cc_library",
-    "envoy_extension_package",
+    "envoy_contrib_package",
 )
 load("@rules_python//python:defs.bzl", "py_binary", "py_library")
 load("@kafka_pip3//:requirements.bzl", "requirement")
 
 licenses(["notice"])  # Apache 2
 
+envoy_contrib_package()
+
 # Kafka network filter.
 # Broker filter public docs: docs/root/configuration/network_filters/kafka_broker_filter.rst
 
-envoy_extension_package()
-
-envoy_cc_extension(
+envoy_cc_contrib_extension(
     name = "kafka_broker_config_lib",
     srcs = ["broker/config.cc"],
     hdrs = ["broker/config.h"],
@@ -22,7 +22,7 @@ envoy_cc_extension(
         ":kafka_broker_filter_lib",
         "//source/extensions/filters/network:well_known_names",
         "//source/extensions/filters/network/common:factory_base_lib",
-        "@envoy_api//envoy/extensions/filters/network/kafka_broker/v3:pkg_cc_proto",
+        "@envoy_api//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg_cc_proto",
     ],
 )
 
diff --git a/source/extensions/filters/network/kafka/broker/config.cc b/contrib/kafka/filters/network/source/broker/config.cc
similarity index 88%
rename from source/extensions/filters/network/kafka/broker/config.cc
rename to contrib/kafka/filters/network/source/broker/config.cc
index 5e8620728f66..459ce5fd20d8 100644
--- a/source/extensions/filters/network/kafka/broker/config.cc
+++ b/contrib/kafka/filters/network/source/broker/config.cc
@@ -1,10 +1,10 @@
-#include "source/extensions/filters/network/kafka/broker/config.h"
+#include "contrib/kafka/filters/network/source/broker/config.h"
 
 #include "envoy/registry/registry.h"
 #include "envoy/server/filter_config.h"
 #include "envoy/stats/scope.h"
 
-#include "source/extensions/filters/network/kafka/broker/filter.h"
+#include "contrib/kafka/filters/network/source/broker/filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/broker/config.h b/contrib/kafka/filters/network/source/broker/config.h
similarity index 84%
rename from source/extensions/filters/network/kafka/broker/config.h
rename to contrib/kafka/filters/network/source/broker/config.h
index 62ed619aedec..c41a1cdf55d5 100644
--- a/source/extensions/filters/network/kafka/broker/config.h
+++ b/contrib/kafka/filters/network/source/broker/config.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.pb.h"
-#include "envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.pb.validate.h"
-
 #include "source/extensions/filters/network/common/factory_base.h"
 #include "source/extensions/filters/network/well_known_names.h"
 
+#include "contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.pb.h"
+#include "contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.pb.validate.h"
+
 namespace Envoy {
 namespace Extensions {
 namespace NetworkFilters {
diff --git a/source/extensions/filters/network/kafka/broker/filter.cc b/contrib/kafka/filters/network/source/broker/filter.cc
similarity index 98%
rename from source/extensions/filters/network/kafka/broker/filter.cc
rename to contrib/kafka/filters/network/source/broker/filter.cc
index 88427ea6f35d..855226780ebd 100644
--- a/source/extensions/filters/network/kafka/broker/filter.cc
+++ b/contrib/kafka/filters/network/source/broker/filter.cc
@@ -1,4 +1,4 @@
-#include "source/extensions/filters/network/kafka/broker/filter.h"
+#include "contrib/kafka/filters/network/source/broker/filter.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/broker/filter.h b/contrib/kafka/filters/network/source/broker/filter.h
similarity index 94%
rename from source/extensions/filters/network/kafka/broker/filter.h
rename to contrib/kafka/filters/network/source/broker/filter.h
index 57c63de0dcf0..207115838000 100644
--- a/source/extensions/filters/network/kafka/broker/filter.h
+++ b/contrib/kafka/filters/network/source/broker/filter.h
@@ -4,13 +4,13 @@
 #include "envoy/stats/scope.h"
 
 #include "source/common/common/logger.h"
-#include "source/extensions/filters/network/kafka/external/request_metrics.h"
-#include "source/extensions/filters/network/kafka/external/response_metrics.h"
-#include "source/extensions/filters/network/kafka/parser.h"
-#include "source/extensions/filters/network/kafka/request_codec.h"
-#include "source/extensions/filters/network/kafka/response_codec.h"
 
 #include "absl/container/flat_hash_map.h"
+#include "contrib/kafka/filters/network/source/external/request_metrics.h"
+#include "contrib/kafka/filters/network/source/external/response_metrics.h"
+#include "contrib/kafka/filters/network/source/parser.h"
+#include "contrib/kafka/filters/network/source/request_codec.h"
+#include "contrib/kafka/filters/network/source/response_codec.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/codec.h b/contrib/kafka/filters/network/source/codec.h
similarity index 100%
rename from source/extensions/filters/network/kafka/codec.h
rename to contrib/kafka/filters/network/source/codec.h
diff --git a/source/extensions/filters/network/kafka/kafka_request.h b/contrib/kafka/filters/network/source/kafka_request.h
similarity index 96%
rename from source/extensions/filters/network/kafka/kafka_request.h
rename to contrib/kafka/filters/network/source/kafka_request.h
index b828d76b9700..407e0e5c09f2 100644
--- a/source/extensions/filters/network/kafka/kafka_request.h
+++ b/contrib/kafka/filters/network/source/kafka_request.h
@@ -2,9 +2,9 @@
 
 #include "envoy/common/exception.h"
 
-#include "source/extensions/filters/network/kafka/external/serialization_composite.h"
-#include "source/extensions/filters/network/kafka/serialization.h"
-#include "source/extensions/filters/network/kafka/tagged_fields.h"
+#include "contrib/kafka/filters/network/source/external/serialization_composite.h"
+#include "contrib/kafka/filters/network/source/serialization.h"
+#include "contrib/kafka/filters/network/source/tagged_fields.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/kafka_request_parser.cc b/contrib/kafka/filters/network/source/kafka_request_parser.cc
similarity index 97%
rename from source/extensions/filters/network/kafka/kafka_request_parser.cc
rename to contrib/kafka/filters/network/source/kafka_request_parser.cc
index c713dad186a3..cd8d25fe5d33 100644
--- a/source/extensions/filters/network/kafka/kafka_request_parser.cc
+++ b/contrib/kafka/filters/network/source/kafka_request_parser.cc
@@ -1,4 +1,4 @@
-#include "source/extensions/filters/network/kafka/kafka_request_parser.h"
+#include "contrib/kafka/filters/network/source/kafka_request_parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/kafka_request_parser.h b/contrib/kafka/filters/network/source/kafka_request_parser.h
similarity index 97%
rename from source/extensions/filters/network/kafka/kafka_request_parser.h
rename to contrib/kafka/filters/network/source/kafka_request_parser.h
index 8afdc769de08..e9dfa6fe072f 100644
--- a/source/extensions/filters/network/kafka/kafka_request_parser.h
+++ b/contrib/kafka/filters/network/source/kafka_request_parser.h
@@ -5,9 +5,10 @@
 #include "envoy/common/exception.h"
 
 #include "source/common/common/assert.h"
-#include "source/extensions/filters/network/kafka/kafka_request.h"
-#include "source/extensions/filters/network/kafka/parser.h"
-#include "source/extensions/filters/network/kafka/tagged_fields.h"
+
+#include "contrib/kafka/filters/network/source/kafka_request.h"
+#include "contrib/kafka/filters/network/source/parser.h"
+#include "contrib/kafka/filters/network/source/tagged_fields.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/kafka_response.h b/contrib/kafka/filters/network/source/kafka_response.h
similarity index 95%
rename from source/extensions/filters/network/kafka/kafka_response.h
rename to contrib/kafka/filters/network/source/kafka_response.h
index 4a2a9d9ff8c1..32bc8317f513 100644
--- a/source/extensions/filters/network/kafka/kafka_response.h
+++ b/contrib/kafka/filters/network/source/kafka_response.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "source/extensions/filters/network/kafka/external/serialization_composite.h"
-#include "source/extensions/filters/network/kafka/serialization.h"
-#include "source/extensions/filters/network/kafka/tagged_fields.h"
+#include "contrib/kafka/filters/network/source/external/serialization_composite.h"
+#include "contrib/kafka/filters/network/source/serialization.h"
+#include "contrib/kafka/filters/network/source/tagged_fields.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/kafka_response_parser.cc b/contrib/kafka/filters/network/source/kafka_response_parser.cc
similarity index 97%
rename from source/extensions/filters/network/kafka/kafka_response_parser.cc
rename to contrib/kafka/filters/network/source/kafka_response_parser.cc
index dc0a8a9b1f98..44177882a5c0 100644
--- a/source/extensions/filters/network/kafka/kafka_response_parser.cc
+++ b/contrib/kafka/filters/network/source/kafka_response_parser.cc
@@ -1,4 +1,4 @@
-#include "source/extensions/filters/network/kafka/kafka_response_parser.h"
+#include "contrib/kafka/filters/network/source/kafka_response_parser.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/extensions/filters/network/kafka/kafka_response_parser.h b/contrib/kafka/filters/network/source/kafka_response_parser.h
similarity index 97%
rename from source/extensions/filters/network/kafka/kafka_response_parser.h
rename to contrib/kafka/filters/network/source/kafka_response_parser.h
index ab3fd2d66b1d..56cf350592ea 100644
--- a/source/extensions/filters/network/kafka/kafka_response_parser.h
+++ b/contrib/kafka/filters/network/source/kafka_response_parser.h
@@ -3,9 +3,9 @@
 #include <map>
 #include <memory>
 
-#include "source/extensions/filters/network/kafka/kafka_response.h"
-#include "source/extensions/filters/network/kafka/parser.h"
-#include "source/extensions/filters/network/kafka/tagged_fields.h"
+#include "contrib/kafka/filters/network/source/kafka_response.h"
+#include "contrib/kafka/filters/network/source/parser.h"
+#include "contrib/kafka/filters/network/source/tagged_fields.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/kafka_types.h b/contrib/kafka/filters/network/source/kafka_types.h
similarity index 100%
rename from source/extensions/filters/network/kafka/kafka_types.h
rename to contrib/kafka/filters/network/source/kafka_types.h
diff --git a/source/extensions/filters/network/kafka/mesh/BUILD b/contrib/kafka/filters/network/source/mesh/BUILD
similarity index 66%
rename from source/extensions/filters/network/kafka/mesh/BUILD
rename to contrib/kafka/filters/network/source/mesh/BUILD
index 79d1a366b2f2..e43c9ca50592 100644
--- a/source/extensions/filters/network/kafka/mesh/BUILD
+++ b/contrib/kafka/filters/network/source/mesh/BUILD
@@ -1,14 +1,14 @@
 load(
     "//bazel:envoy_build_system.bzl",
     "envoy_cc_library",
-    "envoy_extension_package",
+    "envoy_contrib_package",
 )
 
 licenses(["notice"])  # Apache 2
 
-# Kafka-mesh network filter.
+envoy_contrib_package()
 
-envoy_extension_package()
+# Kafka-mesh network filter.
 
 envoy_cc_library(
     name = "filter_lib",
@@ -21,13 +21,13 @@ envoy_cc_library(
         ":abstract_command_lib",
         ":request_processor_lib",
         ":upstream_config_lib",
+        "//contrib/kafka/filters/network/source:kafka_request_codec_lib",
+        "//contrib/kafka/filters/network/source:kafka_response_codec_lib",
         "//envoy/buffer:buffer_interface",
         "//envoy/network:connection_interface",
         "//envoy/network:filter_interface",
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
-        "//source/extensions/filters/network/kafka:kafka_request_codec_lib",
-        "//source/extensions/filters/network/kafka:kafka_response_codec_lib",
     ],
 )
 
@@ -43,11 +43,11 @@ envoy_cc_library(
     deps = [
         ":abstract_command_lib",
         ":upstream_config_lib",
+        "//contrib/kafka/filters/network/source:kafka_request_codec_lib",
+        "//contrib/kafka/filters/network/source:kafka_request_parser_lib",
+        "//contrib/kafka/filters/network/source/mesh/command_handlers:api_versions_lib",
+        "//contrib/kafka/filters/network/source/mesh/command_handlers:metadata_lib",
         "//source/common/common:minimal_logger_lib",
-        "//source/extensions/filters/network/kafka:kafka_request_codec_lib",
-        "//source/extensions/filters/network/kafka:kafka_request_parser_lib",
-        "//source/extensions/filters/network/kafka/mesh/command_handlers:api_versions_lib",
-        "//source/extensions/filters/network/kafka/mesh/command_handlers:metadata_lib",
     ],
 )
 
@@ -61,9 +61,9 @@ envoy_cc_library(
     ],
     tags = ["skip_on_windows"],
     deps = [
+        "//contrib/kafka/filters/network/source:kafka_response_lib",
+        "//contrib/kafka/filters/network/source:tagged_fields_lib",
         "//source/common/common:minimal_logger_lib",
-        "//source/extensions/filters/network/kafka:kafka_response_lib",
-        "//source/extensions/filters/network/kafka:tagged_fields_lib",
     ],
 )
 
diff --git a/source/extensions/filters/network/kafka/mesh/abstract_command.cc b/contrib/kafka/filters/network/source/mesh/abstract_command.cc
similarity index 89%
rename from source/extensions/filters/network/kafka/mesh/abstract_command.cc
rename to contrib/kafka/filters/network/source/mesh/abstract_command.cc
index eab6dbb47df5..c20933103836 100644
--- a/source/extensions/filters/network/kafka/mesh/abstract_command.cc
+++ b/contrib/kafka/filters/network/source/mesh/abstract_command.cc
@@ -1,4 +1,4 @@
-#include "source/extensions/filters/network/kafka/mesh/abstract_command.h"
+#include "contrib/kafka/filters/network/source/mesh/abstract_command.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/mesh/abstract_command.h b/contrib/kafka/filters/network/source/mesh/abstract_command.h
similarity index 97%
rename from source/extensions/filters/network/kafka/mesh/abstract_command.h
rename to contrib/kafka/filters/network/source/mesh/abstract_command.h
index 40cbb18396f5..e7ee458d1e7d 100644
--- a/source/extensions/filters/network/kafka/mesh/abstract_command.h
+++ b/contrib/kafka/filters/network/source/mesh/abstract_command.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include "source/common/common/logger.h"
-#include "source/extensions/filters/network/kafka/kafka_response.h"
+
+#include "contrib/kafka/filters/network/source/kafka_response.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/contrib/kafka/filters/network/source/mesh/command_handlers/BUILD b/contrib/kafka/filters/network/source/mesh/command_handlers/BUILD
new file mode 100644
index 000000000000..7c63a037d9e6
--- /dev/null
+++ b/contrib/kafka/filters/network/source/mesh/command_handlers/BUILD
@@ -0,0 +1,47 @@
+load(
+    "//bazel:envoy_build_system.bzl",
+    "envoy_cc_library",
+    "envoy_contrib_package",
+)
+
+licenses(["notice"])  # Apache 2
+
+envoy_contrib_package()
+
+# Handlers for particular Kafka requests that are used by Kafka-mesh filter.
+
+envoy_cc_library(
+    name = "metadata_lib",
+    srcs = [
+        "metadata.cc",
+    ],
+    hdrs = [
+        "metadata.h",
+    ],
+    tags = ["skip_on_windows"],
+    deps = [
+        "//contrib/kafka/filters/network/source:kafka_request_parser_lib",
+        "//contrib/kafka/filters/network/source:kafka_response_parser_lib",
+        "//contrib/kafka/filters/network/source/mesh:abstract_command_lib",
+        "//contrib/kafka/filters/network/source/mesh:upstream_config_lib",
+        "//source/common/common:minimal_logger_lib",
+    ],
+)
+
+envoy_cc_library(
+    name = "api_versions_lib",
+    srcs = [
+        "api_versions.cc",
+    ],
+    hdrs = [
+        "api_versions.h",
+    ],
+    tags = ["skip_on_windows"],
+    deps = [
+        "//contrib/kafka/filters/network/source:kafka_request_parser_lib",
+        "//contrib/kafka/filters/network/source:kafka_response_parser_lib",
+        "//contrib/kafka/filters/network/source:tagged_fields_lib",
+        "//contrib/kafka/filters/network/source/mesh:abstract_command_lib",
+        "//source/common/common:minimal_logger_lib",
+    ],
+)
diff --git a/source/extensions/filters/network/kafka/mesh/command_handlers/api_versions.cc b/contrib/kafka/filters/network/source/mesh/command_handlers/api_versions.cc
similarity index 91%
rename from source/extensions/filters/network/kafka/mesh/command_handlers/api_versions.cc
rename to contrib/kafka/filters/network/source/mesh/command_handlers/api_versions.cc
index 8ec3a92616fb..1fa8cfa8f5b8 100644
--- a/source/extensions/filters/network/kafka/mesh/command_handlers/api_versions.cc
+++ b/contrib/kafka/filters/network/source/mesh/command_handlers/api_versions.cc
@@ -1,7 +1,7 @@
-#include "source/extensions/filters/network/kafka/mesh/command_handlers/api_versions.h"
+#include "contrib/kafka/filters/network/source/mesh/command_handlers/api_versions.h"
 
-#include "source/extensions/filters/network/kafka/external/requests.h"
-#include "source/extensions/filters/network/kafka/external/responses.h"
+#include "contrib/kafka/filters/network/source/external/requests.h"
+#include "contrib/kafka/filters/network/source/external/responses.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/mesh/command_handlers/api_versions.h b/contrib/kafka/filters/network/source/mesh/command_handlers/api_versions.h
similarity index 85%
rename from source/extensions/filters/network/kafka/mesh/command_handlers/api_versions.h
rename to contrib/kafka/filters/network/source/mesh/command_handlers/api_versions.h
index 004e3a1cd430..11344c380aa8 100644
--- a/source/extensions/filters/network/kafka/mesh/command_handlers/api_versions.h
+++ b/contrib/kafka/filters/network/source/mesh/command_handlers/api_versions.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "source/extensions/filters/network/kafka/external/requests.h"
-#include "source/extensions/filters/network/kafka/mesh/abstract_command.h"
+#include "contrib/kafka/filters/network/source/external/requests.h"
+#include "contrib/kafka/filters/network/source/mesh/abstract_command.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/mesh/command_handlers/metadata.cc b/contrib/kafka/filters/network/source/mesh/command_handlers/metadata.cc
similarity index 94%
rename from source/extensions/filters/network/kafka/mesh/command_handlers/metadata.cc
rename to contrib/kafka/filters/network/source/mesh/command_handlers/metadata.cc
index dca474b82379..05b63b451d1f 100644
--- a/source/extensions/filters/network/kafka/mesh/command_handlers/metadata.cc
+++ b/contrib/kafka/filters/network/source/mesh/command_handlers/metadata.cc
@@ -1,6 +1,6 @@
-#include "source/extensions/filters/network/kafka/mesh/command_handlers/metadata.h"
+#include "contrib/kafka/filters/network/source/mesh/command_handlers/metadata.h"
 
-#include "source/extensions/filters/network/kafka/external/responses.h"
+#include "contrib/kafka/filters/network/source/external/responses.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/mesh/command_handlers/metadata.h b/contrib/kafka/filters/network/source/mesh/command_handlers/metadata.h
similarity index 79%
rename from source/extensions/filters/network/kafka/mesh/command_handlers/metadata.h
rename to contrib/kafka/filters/network/source/mesh/command_handlers/metadata.h
index c98f7b06777c..97e7801aa052 100644
--- a/source/extensions/filters/network/kafka/mesh/command_handlers/metadata.h
+++ b/contrib/kafka/filters/network/source/mesh/command_handlers/metadata.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "source/extensions/filters/network/kafka/external/requests.h"
-#include "source/extensions/filters/network/kafka/mesh/abstract_command.h"
-#include "source/extensions/filters/network/kafka/mesh/upstream_config.h"
+#include "contrib/kafka/filters/network/source/external/requests.h"
+#include "contrib/kafka/filters/network/source/mesh/abstract_command.h"
+#include "contrib/kafka/filters/network/source/mesh/upstream_config.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/mesh/filter.cc b/contrib/kafka/filters/network/source/mesh/filter.cc
similarity index 93%
rename from source/extensions/filters/network/kafka/mesh/filter.cc
rename to contrib/kafka/filters/network/source/mesh/filter.cc
index 02b86b59f9d0..fdea677c8e1b 100644
--- a/source/extensions/filters/network/kafka/mesh/filter.cc
+++ b/contrib/kafka/filters/network/source/mesh/filter.cc
@@ -1,11 +1,12 @@
-#include "source/extensions/filters/network/kafka/mesh/filter.h"
+#include "contrib/kafka/filters/network/source/mesh/filter.h"
 
 #include "envoy/network/connection.h"
 
 #include "source/common/buffer/buffer_impl.h"
-#include "source/extensions/filters/network/kafka/external/requests.h"
-#include "source/extensions/filters/network/kafka/external/responses.h"
-#include "source/extensions/filters/network/kafka/response_codec.h"
+
+#include "contrib/kafka/filters/network/source/external/requests.h"
+#include "contrib/kafka/filters/network/source/external/responses.h"
+#include "contrib/kafka/filters/network/source/response_codec.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/mesh/filter.h b/contrib/kafka/filters/network/source/mesh/filter.h
similarity index 89%
rename from source/extensions/filters/network/kafka/mesh/filter.h
rename to contrib/kafka/filters/network/source/mesh/filter.h
index 6f6d7effbb71..86f21d23d046 100644
--- a/source/extensions/filters/network/kafka/mesh/filter.h
+++ b/contrib/kafka/filters/network/source/mesh/filter.h
@@ -6,11 +6,12 @@
 #include "envoy/stats/scope.h"
 
 #include "source/common/common/logger.h"
-#include "source/extensions/filters/network/kafka/external/requests.h"
-#include "source/extensions/filters/network/kafka/mesh/abstract_command.h"
-#include "source/extensions/filters/network/kafka/mesh/request_processor.h"
-#include "source/extensions/filters/network/kafka/mesh/upstream_config.h"
-#include "source/extensions/filters/network/kafka/request_codec.h"
+
+#include "contrib/kafka/filters/network/source/external/requests.h"
+#include "contrib/kafka/filters/network/source/mesh/abstract_command.h"
+#include "contrib/kafka/filters/network/source/mesh/request_processor.h"
+#include "contrib/kafka/filters/network/source/mesh/upstream_config.h"
+#include "contrib/kafka/filters/network/source/request_codec.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/mesh/request_processor.cc b/contrib/kafka/filters/network/source/mesh/request_processor.cc
similarity index 89%
rename from source/extensions/filters/network/kafka/mesh/request_processor.cc
rename to contrib/kafka/filters/network/source/mesh/request_processor.cc
index 7c787f352887..d47e3e7c552c 100644
--- a/source/extensions/filters/network/kafka/mesh/request_processor.cc
+++ b/contrib/kafka/filters/network/source/mesh/request_processor.cc
@@ -1,9 +1,9 @@
-#include "source/extensions/filters/network/kafka/mesh/request_processor.h"
+#include "contrib/kafka/filters/network/source/mesh/request_processor.h"
 
 #include "envoy/common/exception.h"
 
-#include "source/extensions/filters/network/kafka/mesh/command_handlers/api_versions.h"
-#include "source/extensions/filters/network/kafka/mesh/command_handlers/metadata.h"
+#include "contrib/kafka/filters/network/source/mesh/command_handlers/api_versions.h"
+#include "contrib/kafka/filters/network/source/mesh/command_handlers/metadata.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/mesh/request_processor.h b/contrib/kafka/filters/network/source/mesh/request_processor.h
similarity index 77%
rename from source/extensions/filters/network/kafka/mesh/request_processor.h
rename to contrib/kafka/filters/network/source/mesh/request_processor.h
index 3b3e2271b096..a28f49c8f1df 100644
--- a/source/extensions/filters/network/kafka/mesh/request_processor.h
+++ b/contrib/kafka/filters/network/source/mesh/request_processor.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include "source/common/common/logger.h"
-#include "source/extensions/filters/network/kafka/external/requests.h"
-#include "source/extensions/filters/network/kafka/mesh/abstract_command.h"
-#include "source/extensions/filters/network/kafka/mesh/upstream_config.h"
-#include "source/extensions/filters/network/kafka/request_codec.h"
+
+#include "contrib/kafka/filters/network/source/external/requests.h"
+#include "contrib/kafka/filters/network/source/mesh/abstract_command.h"
+#include "contrib/kafka/filters/network/source/mesh/upstream_config.h"
+#include "contrib/kafka/filters/network/source/request_codec.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/mesh/upstream_config.h b/contrib/kafka/filters/network/source/mesh/upstream_config.h
similarity index 100%
rename from source/extensions/filters/network/kafka/mesh/upstream_config.h
rename to contrib/kafka/filters/network/source/mesh/upstream_config.h
diff --git a/source/extensions/filters/network/kafka/parser.h b/contrib/kafka/filters/network/source/parser.h
similarity index 100%
rename from source/extensions/filters/network/kafka/parser.h
rename to contrib/kafka/filters/network/source/parser.h
diff --git a/source/extensions/filters/network/kafka/protocol/complex_type_template.j2 b/contrib/kafka/filters/network/source/protocol/complex_type_template.j2
similarity index 100%
rename from source/extensions/filters/network/kafka/protocol/complex_type_template.j2
rename to contrib/kafka/filters/network/source/protocol/complex_type_template.j2
diff --git a/source/extensions/filters/network/kafka/protocol/generator.py b/contrib/kafka/filters/network/source/protocol/generator.py
similarity index 100%
rename from source/extensions/filters/network/kafka/protocol/generator.py
rename to contrib/kafka/filters/network/source/protocol/generator.py
diff --git a/source/extensions/filters/network/kafka/protocol/kafka_request_resolver_cc.j2 b/contrib/kafka/filters/network/source/protocol/kafka_request_resolver_cc.j2
similarity index 89%
rename from source/extensions/filters/network/kafka/protocol/kafka_request_resolver_cc.j2
rename to contrib/kafka/filters/network/source/protocol/kafka_request_resolver_cc.j2
index 0d2da9aaa7c5..be7b83288020 100644
--- a/source/extensions/filters/network/kafka/protocol/kafka_request_resolver_cc.j2
+++ b/contrib/kafka/filters/network/source/protocol/kafka_request_resolver_cc.j2
@@ -3,9 +3,9 @@
   Defines default Kafka request resolver, that uses request parsers in (also generated)
   'requests.h'.
 #}
-#include "source/extensions/filters/network/kafka/external/requests.h"
-#include "source/extensions/filters/network/kafka/kafka_request_parser.h"
-#include "source/extensions/filters/network/kafka/parser.h"
+#include "contrib/kafka/filters/network/source/external/requests.h"
+#include "contrib/kafka/filters/network/source/kafka_request_parser.h"
+#include "contrib/kafka/filters/network/source/parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/protocol/kafka_response_resolver_cc.j2 b/contrib/kafka/filters/network/source/protocol/kafka_response_resolver_cc.j2
similarity index 93%
rename from source/extensions/filters/network/kafka/protocol/kafka_response_resolver_cc.j2
rename to contrib/kafka/filters/network/source/protocol/kafka_response_resolver_cc.j2
index 0256e370dca6..5524b0cd8494 100644
--- a/source/extensions/filters/network/kafka/protocol/kafka_response_resolver_cc.j2
+++ b/contrib/kafka/filters/network/source/protocol/kafka_response_resolver_cc.j2
@@ -3,8 +3,8 @@
   Defines default Kafka response resolver, that uses response parsers in (also generated)
   'responses.h'.
 #}
-#include "source/extensions/filters/network/kafka/external/responses.h"
-#include "source/extensions/filters/network/kafka/kafka_response_parser.h"
+#include "contrib/kafka/filters/network/source/external/responses.h"
+#include "contrib/kafka/filters/network/source/kafka_response_parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/protocol/launcher.py b/contrib/kafka/filters/network/source/protocol/launcher.py
similarity index 95%
rename from source/extensions/filters/network/kafka/protocol/launcher.py
rename to contrib/kafka/filters/network/source/protocol/launcher.py
index f8b36570d037..b8dd4f287f09 100644
--- a/source/extensions/filters/network/kafka/protocol/launcher.py
+++ b/contrib/kafka/filters/network/source/protocol/launcher.py
@@ -2,7 +2,7 @@
 
 # Launcher for generating Kafka protocol code.
 
-import source.extensions.filters.network.kafka.protocol.generator as generator
+import contrib.kafka.filters.network.source.protocol.generator as generator
 import sys
 import os
 
diff --git a/source/extensions/filters/network/kafka/protocol/request_metrics_h.j2 b/contrib/kafka/filters/network/source/protocol/request_metrics_h.j2
similarity index 100%
rename from source/extensions/filters/network/kafka/protocol/request_metrics_h.j2
rename to contrib/kafka/filters/network/source/protocol/request_metrics_h.j2
diff --git a/source/extensions/filters/network/kafka/protocol/request_parser.j2 b/contrib/kafka/filters/network/source/protocol/request_parser.j2
similarity index 100%
rename from source/extensions/filters/network/kafka/protocol/request_parser.j2
rename to contrib/kafka/filters/network/source/protocol/request_parser.j2
diff --git a/source/extensions/filters/network/kafka/protocol/requests_h.j2 b/contrib/kafka/filters/network/source/protocol/requests_h.j2
similarity index 90%
rename from source/extensions/filters/network/kafka/protocol/requests_h.j2
rename to contrib/kafka/filters/network/source/protocol/requests_h.j2
index e6b4fd42976c..eae7afc9ac99 100644
--- a/source/extensions/filters/network/kafka/protocol/requests_h.j2
+++ b/contrib/kafka/filters/network/source/protocol/requests_h.j2
@@ -22,8 +22,8 @@
     (because partition data is present in every FetchRequestTopic version).
 #}
 #pragma once
-#include "source/extensions/filters/network/kafka/kafka_request.h"
-#include "source/extensions/filters/network/kafka/kafka_request_parser.h"
+#include "contrib/kafka/filters/network/source/kafka_request.h"
+#include "contrib/kafka/filters/network/source/kafka_request_parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/protocol/response_metrics_h.j2 b/contrib/kafka/filters/network/source/protocol/response_metrics_h.j2
similarity index 100%
rename from source/extensions/filters/network/kafka/protocol/response_metrics_h.j2
rename to contrib/kafka/filters/network/source/protocol/response_metrics_h.j2
diff --git a/source/extensions/filters/network/kafka/protocol/response_parser.j2 b/contrib/kafka/filters/network/source/protocol/response_parser.j2
similarity index 100%
rename from source/extensions/filters/network/kafka/protocol/response_parser.j2
rename to contrib/kafka/filters/network/source/protocol/response_parser.j2
diff --git a/source/extensions/filters/network/kafka/protocol/responses_h.j2 b/contrib/kafka/filters/network/source/protocol/responses_h.j2
similarity index 90%
rename from source/extensions/filters/network/kafka/protocol/responses_h.j2
rename to contrib/kafka/filters/network/source/protocol/responses_h.j2
index 099e6c014c03..643c6f70966b 100644
--- a/source/extensions/filters/network/kafka/protocol/responses_h.j2
+++ b/contrib/kafka/filters/network/source/protocol/responses_h.j2
@@ -23,8 +23,8 @@
   - AbortedTransaction & its Deserializers (starting with version 4).
 #}
 #pragma once
-#include "source/extensions/filters/network/kafka/kafka_response.h"
-#include "source/extensions/filters/network/kafka/kafka_response_parser.h"
+#include "contrib/kafka/filters/network/source/kafka_response.h"
+#include "contrib/kafka/filters/network/source/kafka_response_parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/request_codec.cc b/contrib/kafka/filters/network/source/request_codec.cc
similarity index 93%
rename from source/extensions/filters/network/kafka/request_codec.cc
rename to contrib/kafka/filters/network/source/request_codec.cc
index f389cecad74b..646cef850e9a 100644
--- a/source/extensions/filters/network/kafka/request_codec.cc
+++ b/contrib/kafka/filters/network/source/request_codec.cc
@@ -1,4 +1,4 @@
-#include "source/extensions/filters/network/kafka/request_codec.h"
+#include "contrib/kafka/filters/network/source/request_codec.h"
 
 #include "source/common/buffer/buffer_impl.h"
 
diff --git a/source/extensions/filters/network/kafka/request_codec.h b/contrib/kafka/filters/network/source/request_codec.h
similarity index 91%
rename from source/extensions/filters/network/kafka/request_codec.h
rename to contrib/kafka/filters/network/source/request_codec.h
index 07fa4b2b90e0..25bcbbfbe1fd 100644
--- a/source/extensions/filters/network/kafka/request_codec.h
+++ b/contrib/kafka/filters/network/source/request_codec.h
@@ -3,10 +3,10 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/common/pure.h"
 
-#include "source/extensions/filters/network/kafka/codec.h"
-#include "source/extensions/filters/network/kafka/kafka_request.h"
-#include "source/extensions/filters/network/kafka/kafka_request_parser.h"
-#include "source/extensions/filters/network/kafka/parser.h"
+#include "contrib/kafka/filters/network/source/codec.h"
+#include "contrib/kafka/filters/network/source/kafka_request.h"
+#include "contrib/kafka/filters/network/source/kafka_request_parser.h"
+#include "contrib/kafka/filters/network/source/parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/requirements.txt b/contrib/kafka/filters/network/source/requirements.txt
similarity index 100%
rename from source/extensions/filters/network/kafka/requirements.txt
rename to contrib/kafka/filters/network/source/requirements.txt
diff --git a/source/extensions/filters/network/kafka/response_codec.cc b/contrib/kafka/filters/network/source/response_codec.cc
similarity index 95%
rename from source/extensions/filters/network/kafka/response_codec.cc
rename to contrib/kafka/filters/network/source/response_codec.cc
index ccde039bb951..48400a91a73b 100644
--- a/source/extensions/filters/network/kafka/response_codec.cc
+++ b/contrib/kafka/filters/network/source/response_codec.cc
@@ -1,4 +1,4 @@
-#include "source/extensions/filters/network/kafka/response_codec.h"
+#include "contrib/kafka/filters/network/source/response_codec.h"
 
 #include "source/common/buffer/buffer_impl.h"
 
diff --git a/source/extensions/filters/network/kafka/response_codec.h b/contrib/kafka/filters/network/source/response_codec.h
similarity index 96%
rename from source/extensions/filters/network/kafka/response_codec.h
rename to contrib/kafka/filters/network/source/response_codec.h
index 688defdc75b1..72f900a9ef34 100644
--- a/source/extensions/filters/network/kafka/response_codec.h
+++ b/contrib/kafka/filters/network/source/response_codec.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "source/extensions/filters/network/kafka/codec.h"
-#include "source/extensions/filters/network/kafka/kafka_response_parser.h"
+#include "contrib/kafka/filters/network/source/codec.h"
+#include "contrib/kafka/filters/network/source/kafka_response_parser.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/serialization.cc b/contrib/kafka/filters/network/source/serialization.cc
similarity index 99%
rename from source/extensions/filters/network/kafka/serialization.cc
rename to contrib/kafka/filters/network/source/serialization.cc
index f34f6b0d652a..fc8464f7aac0 100644
--- a/source/extensions/filters/network/kafka/serialization.cc
+++ b/contrib/kafka/filters/network/source/serialization.cc
@@ -1,4 +1,4 @@
-#include "source/extensions/filters/network/kafka/serialization.h"
+#include "contrib/kafka/filters/network/source/serialization.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/serialization.h b/contrib/kafka/filters/network/source/serialization.h
similarity index 99%
rename from source/extensions/filters/network/kafka/serialization.h
rename to contrib/kafka/filters/network/source/serialization.h
index 3abc5f1fb559..3401199c002f 100644
--- a/source/extensions/filters/network/kafka/serialization.h
+++ b/contrib/kafka/filters/network/source/serialization.h
@@ -13,10 +13,10 @@
 #include "source/common/common/fmt.h"
 #include "source/common/common/safe_memcpy.h"
 #include "source/common/common/utility.h"
-#include "source/extensions/filters/network/kafka/kafka_types.h"
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
+#include "contrib/kafka/filters/network/source/kafka_types.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/source/extensions/filters/network/kafka/serialization/generator.py b/contrib/kafka/filters/network/source/serialization/generator.py
similarity index 100%
rename from source/extensions/filters/network/kafka/serialization/generator.py
rename to contrib/kafka/filters/network/source/serialization/generator.py
diff --git a/source/extensions/filters/network/kafka/serialization/launcher.py b/contrib/kafka/filters/network/source/serialization/launcher.py
similarity index 91%
rename from source/extensions/filters/network/kafka/serialization/launcher.py
rename to contrib/kafka/filters/network/source/serialization/launcher.py
index 571f448086a9..bf4b97497a25 100644
--- a/source/extensions/filters/network/kafka/serialization/launcher.py
+++ b/contrib/kafka/filters/network/source/serialization/launcher.py
@@ -2,7 +2,7 @@
 
 # Launcher for generating composite serializer code.
 
-import source.extensions.filters.network.kafka.serialization.generator as generator
+import contrib.kafka.filters.network.source.serialization.generator as generator
 import sys
 import os
 
diff --git a/source/extensions/filters/network/kafka/serialization/serialization_composite_h.j2 b/contrib/kafka/filters/network/source/serialization/serialization_composite_h.j2
similarity index 96%
rename from source/extensions/filters/network/kafka/serialization/serialization_composite_h.j2
rename to contrib/kafka/filters/network/source/serialization/serialization_composite_h.j2
index 0f4e7065c41c..620aa9855cb2 100644
--- a/source/extensions/filters/network/kafka/serialization/serialization_composite_h.j2
+++ b/contrib/kafka/filters/network/source/serialization/serialization_composite_h.j2
@@ -19,8 +19,8 @@
 #include "source/common/common/byte_order.h"
 #include "source/common/common/fmt.h"
 
-#include "source/extensions/filters/network/kafka/kafka_types.h"
-#include "source/extensions/filters/network/kafka/serialization.h"
+#include "contrib/kafka/filters/network/source/kafka_types.h"
+#include "contrib/kafka/filters/network/source/serialization.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/source/extensions/filters/network/kafka/tagged_fields.h b/contrib/kafka/filters/network/source/tagged_fields.h
similarity index 98%
rename from source/extensions/filters/network/kafka/tagged_fields.h
rename to contrib/kafka/filters/network/source/tagged_fields.h
index 6ace5ce2fcca..f9aebaf7472b 100644
--- a/source/extensions/filters/network/kafka/tagged_fields.h
+++ b/contrib/kafka/filters/network/source/tagged_fields.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "source/extensions/filters/network/kafka/serialization.h"
+#include "contrib/kafka/filters/network/source/serialization.h"
 
 /**
  * This header file provides serialization support for tagged fields structure added in 2.4.
diff --git a/test/extensions/filters/network/kafka/BUILD b/contrib/kafka/filters/network/test/BUILD
similarity index 64%
rename from test/extensions/filters/network/kafka/BUILD
rename to contrib/kafka/filters/network/test/BUILD
index 3531b50ba4b3..4c620dcfe43b 100644
--- a/test/extensions/filters/network/kafka/BUILD
+++ b/contrib/kafka/filters/network/test/BUILD
@@ -1,26 +1,23 @@
 load(
     "//bazel:envoy_build_system.bzl",
+    "envoy_cc_test",
     "envoy_cc_test_library",
-    "envoy_package",
-)
-load(
-    "//test/extensions:extensions_build_system.bzl",
-    "envoy_extension_cc_test",
+    "envoy_contrib_package",
 )
 load("@rules_python//python:defs.bzl", "py_binary")
 load("@kafka_pip3//:requirements.bzl", "requirement")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_contrib_package()
 
 envoy_cc_test_library(
     name = "buffer_based_test_lib",
     srcs = [],
     hdrs = ["buffer_based_test.h"],
     deps = [
+        "//contrib/kafka/filters/network/source:serialization_lib",
         "//source/common/buffer:buffer_lib",
-        "//source/extensions/filters/network/kafka:serialization_lib",
     ],
 )
 
@@ -29,30 +26,28 @@ envoy_cc_test_library(
     srcs = ["serialization_utilities.cc"],
     hdrs = ["serialization_utilities.h"],
     deps = [
+        "//contrib/kafka/filters/network/source:serialization_lib",
         "//source/common/buffer:buffer_lib",
-        "//source/extensions/filters/network/kafka:serialization_lib",
     ],
 )
 
-envoy_extension_cc_test(
+envoy_cc_test(
     name = "serialization_test",
     srcs = ["serialization_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
     deps = [
         ":serialization_utilities_lib",
-        "//source/extensions/filters/network/kafka:serialization_lib",
-        "//source/extensions/filters/network/kafka:tagged_fields_lib",
+        "//contrib/kafka/filters/network/source:serialization_lib",
+        "//contrib/kafka/filters/network/source:tagged_fields_lib",
         "//test/mocks/server:server_mocks",
     ],
 )
 
-envoy_extension_cc_test(
+envoy_cc_test(
     name = "serialization_composite_test",
     srcs = ["external/serialization_composite_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
     deps = [
         ":serialization_utilities_lib",
-        "//source/extensions/filters/network/kafka:serialization_lib",
+        "//contrib/kafka/filters/network/source:serialization_lib",
         "//test/mocks/server:server_mocks",
     ],
 )
@@ -76,7 +71,7 @@ py_binary(
     data = glob(["serialization/*.j2"]),
     main = "serialization/launcher.py",
     deps = [
-        "//source/extensions/filters/network/kafka:serialization_composite_generator_lib",
+        "//contrib/kafka/filters/network/source:serialization_composite_generator_lib",
         requirement("Jinja2"),
         requirement("MarkupSafe"),
     ],
@@ -90,61 +85,56 @@ envoy_cc_test_library(
     ],
     hdrs = ["message_utilities.h"],
     deps = [
-        "//source/extensions/filters/network/kafka:kafka_request_parser_lib",
-        "//source/extensions/filters/network/kafka:kafka_response_parser_lib",
+        "//contrib/kafka/filters/network/source:kafka_request_parser_lib",
+        "//contrib/kafka/filters/network/source:kafka_response_parser_lib",
     ],
 )
 
-envoy_extension_cc_test(
+envoy_cc_test(
     name = "kafka_request_parser_test",
     srcs = ["kafka_request_parser_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
     deps = [
         ":buffer_based_test_lib",
         ":serialization_utilities_lib",
-        "//source/extensions/filters/network/kafka:kafka_request_parser_lib",
+        "//contrib/kafka/filters/network/source:kafka_request_parser_lib",
     ],
 )
 
-envoy_extension_cc_test(
+envoy_cc_test(
     name = "request_codec_unit_test",
     srcs = ["request_codec_unit_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
     deps = [
         ":buffer_based_test_lib",
-        "//source/extensions/filters/network/kafka:kafka_request_codec_lib",
+        "//contrib/kafka/filters/network/source:kafka_request_codec_lib",
     ],
 )
 
-envoy_extension_cc_test(
+envoy_cc_test(
     name = "request_codec_integration_test",
     srcs = ["request_codec_integration_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
     deps = [
         ":buffer_based_test_lib",
         ":serialization_utilities_lib",
-        "//source/extensions/filters/network/kafka:kafka_request_codec_lib",
+        "//contrib/kafka/filters/network/source:kafka_request_codec_lib",
     ],
 )
 
-envoy_extension_cc_test(
+envoy_cc_test(
     name = "request_codec_request_test",
     srcs = ["external/request_codec_request_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
     deps = [
         ":buffer_based_test_lib",
         ":serialization_utilities_lib",
-        "//source/extensions/filters/network/kafka:kafka_request_codec_lib",
+        "//contrib/kafka/filters/network/source:kafka_request_codec_lib",
     ],
 )
 
-envoy_extension_cc_test(
+envoy_cc_test(
     name = "requests_test",
     srcs = ["external/requests_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
     deps = [
         ":buffer_based_test_lib",
-        "//source/extensions/filters/network/kafka:kafka_request_codec_lib",
+        "//contrib/kafka/filters/network/source:kafka_request_codec_lib",
     ],
 )
 
@@ -170,56 +160,51 @@ genrule(
     ],
 )
 
-envoy_extension_cc_test(
+envoy_cc_test(
     name = "kafka_response_parser_test",
     srcs = ["kafka_response_parser_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
     deps = [
         ":buffer_based_test_lib",
         ":serialization_utilities_lib",
-        "//source/extensions/filters/network/kafka:kafka_response_parser_lib",
+        "//contrib/kafka/filters/network/source:kafka_response_parser_lib",
     ],
 )
 
-envoy_extension_cc_test(
+envoy_cc_test(
     name = "response_codec_unit_test",
     srcs = ["response_codec_unit_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
     deps = [
         ":buffer_based_test_lib",
-        "//source/extensions/filters/network/kafka:kafka_response_codec_lib",
+        "//contrib/kafka/filters/network/source:kafka_response_codec_lib",
     ],
 )
 
-envoy_extension_cc_test(
+envoy_cc_test(
     name = "response_codec_integration_test",
     srcs = ["response_codec_integration_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
     deps = [
         ":buffer_based_test_lib",
         ":serialization_utilities_lib",
-        "//source/extensions/filters/network/kafka:kafka_response_codec_lib",
+        "//contrib/kafka/filters/network/source:kafka_response_codec_lib",
     ],
 )
 
-envoy_extension_cc_test(
+envoy_cc_test(
     name = "response_codec_response_test",
     srcs = ["external/response_codec_response_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
     deps = [
         ":buffer_based_test_lib",
         ":serialization_utilities_lib",
-        "//source/extensions/filters/network/kafka:kafka_response_codec_lib",
+        "//contrib/kafka/filters/network/source:kafka_response_codec_lib",
     ],
 )
 
-envoy_extension_cc_test(
+envoy_cc_test(
     name = "responses_test",
     srcs = ["external/responses_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
     deps = [
         ":buffer_based_test_lib",
-        "//source/extensions/filters/network/kafka:kafka_response_codec_lib",
+        "//contrib/kafka/filters/network/source:kafka_response_codec_lib",
     ],
 )
 
@@ -251,19 +236,18 @@ py_binary(
     data = glob(["protocol/*.j2"]),
     main = "protocol/launcher.py",
     deps = [
-        "//source/extensions/filters/network/kafka:kafka_protocol_generator_lib",
+        "//contrib/kafka/filters/network/source:kafka_protocol_generator_lib",
         requirement("Jinja2"),
         requirement("MarkupSafe"),
     ],
 )
 
-envoy_extension_cc_test(
+envoy_cc_test(
     name = "metrics_integration_test",
     srcs = ["metrics_integration_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
     deps = [
         ":message_utilities",
-        "//source/extensions/filters/network/kafka:kafka_broker_filter_lib",
+        "//contrib/kafka/filters/network/source:kafka_broker_filter_lib",
         "//test/common/stats:stat_test_utility_lib",
     ],
 )
diff --git a/contrib/kafka/filters/network/test/broker/BUILD b/contrib/kafka/filters/network/test/broker/BUILD
new file mode 100644
index 000000000000..1edda5875b4d
--- /dev/null
+++ b/contrib/kafka/filters/network/test/broker/BUILD
@@ -0,0 +1,41 @@
+load(
+    "//bazel:envoy_build_system.bzl",
+    "envoy_cc_test",
+    "envoy_contrib_package",
+)
+
+licenses(["notice"])  # Apache 2
+
+envoy_contrib_package()
+
+envoy_cc_test(
+    name = "config_unit_test",
+    srcs = ["config_unit_test.cc"],
+    deps = [
+        "//contrib/kafka/filters/network/source:kafka_broker_config_lib",
+        "//test/mocks/server:factory_context_mocks",
+    ],
+)
+
+envoy_cc_test(
+    name = "filter_unit_test",
+    srcs = ["filter_unit_test.cc"],
+    deps = [
+        "//contrib/kafka/filters/network/source:kafka_broker_filter_lib",
+        "//envoy/event:timer_interface",
+        "//test/mocks/network:network_mocks",
+        "//test/mocks/stats:stats_mocks",
+    ],
+)
+
+envoy_cc_test(
+    name = "filter_protocol_test",
+    srcs = ["filter_protocol_test.cc"],
+    deps = [
+        "//contrib/kafka/filters/network/source:kafka_broker_filter_lib",
+        "//contrib/kafka/filters/network/test:buffer_based_test_lib",
+        "//contrib/kafka/filters/network/test:message_utilities",
+        "//test/common/stats:stat_test_utility_lib",
+        "//test/test_common:test_time_lib",
+    ],
+)
diff --git a/test/extensions/filters/network/kafka/broker/config_unit_test.cc b/contrib/kafka/filters/network/test/broker/config_unit_test.cc
similarity index 94%
rename from test/extensions/filters/network/kafka/broker/config_unit_test.cc
rename to contrib/kafka/filters/network/test/broker/config_unit_test.cc
index 4d447883174e..4ec484e5ca98 100644
--- a/test/extensions/filters/network/kafka/broker/config_unit_test.cc
+++ b/contrib/kafka/filters/network/test/broker/config_unit_test.cc
@@ -1,7 +1,6 @@
-#include "source/extensions/filters/network/kafka/broker/config.h"
-
 #include "test/mocks/server/factory_context.h"
 
+#include "contrib/kafka/filters/network/source/broker/config.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/kafka/broker/filter_protocol_test.cc b/contrib/kafka/filters/network/test/broker/filter_protocol_test.cc
similarity index 94%
rename from test/extensions/filters/network/kafka/broker/filter_protocol_test.cc
rename to contrib/kafka/filters/network/test/broker/filter_protocol_test.cc
index 17ef7a3f084a..8d790b14806e 100644
--- a/test/extensions/filters/network/kafka/broker/filter_protocol_test.cc
+++ b/contrib/kafka/filters/network/test/broker/filter_protocol_test.cc
@@ -5,15 +5,15 @@
 
 #include "source/common/common/utility.h"
 #include "source/common/stats/isolated_store_impl.h"
-#include "source/extensions/filters/network/kafka/broker/filter.h"
-#include "source/extensions/filters/network/kafka/external/requests.h"
-#include "source/extensions/filters/network/kafka/external/responses.h"
 
 #include "test/common/stats/stat_test_utility.h"
-#include "test/extensions/filters/network/kafka/buffer_based_test.h"
-#include "test/extensions/filters/network/kafka/message_utilities.h"
 #include "test/test_common/test_time.h"
 
+#include "contrib/kafka/filters/network/source/broker/filter.h"
+#include "contrib/kafka/filters/network/source/external/requests.h"
+#include "contrib/kafka/filters/network/source/external/responses.h"
+#include "contrib/kafka/filters/network/test/buffer_based_test.h"
+#include "contrib/kafka/filters/network/test/message_utilities.h"
 #include "gtest/gtest.h"
 
 namespace Envoy {
diff --git a/test/extensions/filters/network/kafka/broker/filter_unit_test.cc b/contrib/kafka/filters/network/test/broker/filter_unit_test.cc
similarity index 98%
rename from test/extensions/filters/network/kafka/broker/filter_unit_test.cc
rename to contrib/kafka/filters/network/test/broker/filter_unit_test.cc
index d62ca8a68700..a91316250db8 100644
--- a/test/extensions/filters/network/kafka/broker/filter_unit_test.cc
+++ b/contrib/kafka/filters/network/test/broker/filter_unit_test.cc
@@ -1,11 +1,10 @@
 #include "envoy/event/timer.h"
 
-#include "source/extensions/filters/network/kafka/broker/filter.h"
-#include "source/extensions/filters/network/kafka/external/requests.h"
-
 #include "test/mocks/network/mocks.h"
 #include "test/mocks/stats/mocks.h"
 
+#include "contrib/kafka/filters/network/source/broker/filter.h"
+#include "contrib/kafka/filters/network/source/external/requests.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/kafka/broker/integration_test/BUILD b/contrib/kafka/filters/network/test/broker/integration_test/BUILD
similarity index 73%
rename from test/extensions/filters/network/kafka/broker/integration_test/BUILD
rename to contrib/kafka/filters/network/test/broker/integration_test/BUILD
index b3237a218887..37e50692ef66 100644
--- a/test/extensions/filters/network/kafka/broker/integration_test/BUILD
+++ b/contrib/kafka/filters/network/test/broker/integration_test/BUILD
@@ -1,18 +1,15 @@
 load(
     "//bazel:envoy_build_system.bzl",
-    "envoy_package",
-)
-load(
-    "//test/extensions:extensions_build_system.bzl",
-    "envoy_extension_py_test",
+    "envoy_contrib_package",
+    "envoy_py_test",
 )
 load("@kafka_pip3//:requirements.bzl", "requirement")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_contrib_package()
 
-envoy_extension_py_test(
+envoy_py_test(
     name = "kafka_broker_integration_test",
     srcs = [
         "kafka_broker_integration_test.py",
@@ -23,7 +20,6 @@ envoy_extension_py_test(
         "//bazel:remote_jdk11",
         "@kafka_server_binary//:all",
     ] + glob(["*.j2"]),
-    extension_names = ["envoy.filters.network.kafka_broker"],
     flaky = True,
     python_version = "PY3",
     srcs_version = "PY3",
diff --git a/test/extensions/filters/network/kafka/broker/integration_test/README.md b/contrib/kafka/filters/network/test/broker/integration_test/README.md
similarity index 89%
rename from test/extensions/filters/network/kafka/broker/integration_test/README.md
rename to contrib/kafka/filters/network/test/broker/integration_test/README.md
index c0356f486ad7..ba8377cfdb83 100644
--- a/test/extensions/filters/network/kafka/broker/integration_test/README.md
+++ b/contrib/kafka/filters/network/test/broker/integration_test/README.md
@@ -19,6 +19,6 @@ The tests verify if:
 
 ```
 bazel test \
-	//test/extensions/filters/network/kafka/broker/integration_test:kafka_broker_integration_test \
+	//contrib/kafka/filters/network/test/broker/integration_test:kafka_broker_integration_test \
 	--runs_per_test 1000
 ```
diff --git a/test/extensions/filters/network/kafka/broker/integration_test/envoy_config_yaml.j2 b/contrib/kafka/filters/network/test/broker/integration_test/envoy_config_yaml.j2
similarity index 100%
rename from test/extensions/filters/network/kafka/broker/integration_test/envoy_config_yaml.j2
rename to contrib/kafka/filters/network/test/broker/integration_test/envoy_config_yaml.j2
diff --git a/test/extensions/filters/network/kafka/broker/integration_test/kafka_broker_integration_test.py b/contrib/kafka/filters/network/test/broker/integration_test/kafka_broker_integration_test.py
similarity index 100%
rename from test/extensions/filters/network/kafka/broker/integration_test/kafka_broker_integration_test.py
rename to contrib/kafka/filters/network/test/broker/integration_test/kafka_broker_integration_test.py
diff --git a/test/extensions/filters/network/kafka/broker/integration_test/kafka_server_properties.j2 b/contrib/kafka/filters/network/test/broker/integration_test/kafka_server_properties.j2
similarity index 100%
rename from test/extensions/filters/network/kafka/broker/integration_test/kafka_server_properties.j2
rename to contrib/kafka/filters/network/test/broker/integration_test/kafka_server_properties.j2
diff --git a/test/extensions/filters/network/kafka/broker/integration_test/zookeeper_properties.j2 b/contrib/kafka/filters/network/test/broker/integration_test/zookeeper_properties.j2
similarity index 100%
rename from test/extensions/filters/network/kafka/broker/integration_test/zookeeper_properties.j2
rename to contrib/kafka/filters/network/test/broker/integration_test/zookeeper_properties.j2
diff --git a/test/extensions/filters/network/kafka/buffer_based_test.h b/contrib/kafka/filters/network/test/buffer_based_test.h
similarity index 95%
rename from test/extensions/filters/network/kafka/buffer_based_test.h
rename to contrib/kafka/filters/network/test/buffer_based_test.h
index a762fb3a9ec7..6a6ffff3b539 100644
--- a/test/extensions/filters/network/kafka/buffer_based_test.h
+++ b/contrib/kafka/filters/network/test/buffer_based_test.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "source/common/buffer/buffer_impl.h"
-#include "source/extensions/filters/network/kafka/serialization.h"
 
 #include "absl/container/fixed_array.h"
 #include "absl/strings/string_view.h"
+#include "contrib/kafka/filters/network/source/serialization.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/network/kafka/kafka_request_parser_test.cc b/contrib/kafka/filters/network/test/kafka_request_parser_test.cc
similarity index 96%
rename from test/extensions/filters/network/kafka/kafka_request_parser_test.cc
rename to contrib/kafka/filters/network/test/kafka_request_parser_test.cc
index deeb6309bea9..c2a0436cadf3 100644
--- a/test/extensions/filters/network/kafka/kafka_request_parser_test.cc
+++ b/contrib/kafka/filters/network/test/kafka_request_parser_test.cc
@@ -1,8 +1,6 @@
-#include "source/extensions/filters/network/kafka/kafka_request_parser.h"
-
-#include "test/extensions/filters/network/kafka/buffer_based_test.h"
-#include "test/extensions/filters/network/kafka/serialization_utilities.h"
-
+#include "contrib/kafka/filters/network/source/kafka_request_parser.h"
+#include "contrib/kafka/filters/network/test/buffer_based_test.h"
+#include "contrib/kafka/filters/network/test/serialization_utilities.h"
 #include "gmock/gmock.h"
 
 using testing::_;
diff --git a/test/extensions/filters/network/kafka/kafka_response_parser_test.cc b/contrib/kafka/filters/network/test/kafka_response_parser_test.cc
similarity index 96%
rename from test/extensions/filters/network/kafka/kafka_response_parser_test.cc
rename to contrib/kafka/filters/network/test/kafka_response_parser_test.cc
index 17615be344ff..2985905d8003 100644
--- a/test/extensions/filters/network/kafka/kafka_response_parser_test.cc
+++ b/contrib/kafka/filters/network/test/kafka_response_parser_test.cc
@@ -1,8 +1,6 @@
-#include "source/extensions/filters/network/kafka/kafka_response_parser.h"
-
-#include "test/extensions/filters/network/kafka/buffer_based_test.h"
-#include "test/extensions/filters/network/kafka/serialization_utilities.h"
-
+#include "contrib/kafka/filters/network/source/kafka_response_parser.h"
+#include "contrib/kafka/filters/network/test/buffer_based_test.h"
+#include "contrib/kafka/filters/network/test/serialization_utilities.h"
 #include "gmock/gmock.h"
 
 using testing::_;
diff --git a/contrib/kafka/filters/network/test/mesh/BUILD b/contrib/kafka/filters/network/test/mesh/BUILD
new file mode 100644
index 000000000000..afef5fbcff57
--- /dev/null
+++ b/contrib/kafka/filters/network/test/mesh/BUILD
@@ -0,0 +1,37 @@
+load(
+    "//bazel:envoy_build_system.bzl",
+    "envoy_cc_test",
+    "envoy_contrib_package",
+)
+
+licenses(["notice"])  # Apache 2
+
+envoy_contrib_package()
+
+envoy_cc_test(
+    name = "filter_unit_test",
+    srcs = ["filter_unit_test.cc"],
+    tags = ["skip_on_windows"],
+    deps = [
+        "//contrib/kafka/filters/network/source/mesh:filter_lib",
+        "//test/mocks/network:network_mocks",
+    ],
+)
+
+envoy_cc_test(
+    name = "request_processor_unit_test",
+    srcs = ["request_processor_unit_test.cc"],
+    tags = ["skip_on_windows"],
+    deps = [
+        "//contrib/kafka/filters/network/source/mesh:request_processor_lib",
+    ],
+)
+
+envoy_cc_test(
+    name = "abstract_command_unit_test",
+    srcs = ["abstract_command_unit_test.cc"],
+    tags = ["skip_on_windows"],
+    deps = [
+        "//contrib/kafka/filters/network/source/mesh:abstract_command_lib",
+    ],
+)
diff --git a/test/extensions/filters/network/kafka/mesh/abstract_command_unit_test.cc b/contrib/kafka/filters/network/test/mesh/abstract_command_unit_test.cc
similarity index 95%
rename from test/extensions/filters/network/kafka/mesh/abstract_command_unit_test.cc
rename to contrib/kafka/filters/network/test/mesh/abstract_command_unit_test.cc
index e0ff2202f097..48661edf9751 100644
--- a/test/extensions/filters/network/kafka/mesh/abstract_command_unit_test.cc
+++ b/contrib/kafka/filters/network/test/mesh/abstract_command_unit_test.cc
@@ -1,5 +1,4 @@
-#include "source/extensions/filters/network/kafka/mesh/abstract_command.h"
-
+#include "contrib/kafka/filters/network/source/mesh/abstract_command.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/contrib/kafka/filters/network/test/mesh/command_handlers/BUILD b/contrib/kafka/filters/network/test/mesh/command_handlers/BUILD
new file mode 100644
index 000000000000..11308c037983
--- /dev/null
+++ b/contrib/kafka/filters/network/test/mesh/command_handlers/BUILD
@@ -0,0 +1,31 @@
+load(
+    "//bazel:envoy_build_system.bzl",
+    "envoy_cc_test",
+    "envoy_contrib_package",
+)
+
+licenses(["notice"])  # Apache 2
+
+envoy_contrib_package()
+
+envoy_cc_test(
+    name = "metadata_unit_test",
+    srcs = ["metadata_unit_test.cc"],
+    tags = ["skip_on_windows"],
+    deps = [
+        "//contrib/kafka/filters/network/source/mesh/command_handlers:metadata_lib",
+        "//test/mocks/network:network_mocks",
+        "//test/mocks/stats:stats_mocks",
+    ],
+)
+
+envoy_cc_test(
+    name = "api_versions_unit_test",
+    srcs = ["api_versions_unit_test.cc"],
+    tags = ["skip_on_windows"],
+    deps = [
+        "//contrib/kafka/filters/network/source/mesh/command_handlers:api_versions_lib",
+        "//test/mocks/network:network_mocks",
+        "//test/mocks/stats:stats_mocks",
+    ],
+)
diff --git a/test/extensions/filters/network/kafka/mesh/command_handlers/api_versions_unit_test.cc b/contrib/kafka/filters/network/test/mesh/command_handlers/api_versions_unit_test.cc
similarity index 93%
rename from test/extensions/filters/network/kafka/mesh/command_handlers/api_versions_unit_test.cc
rename to contrib/kafka/filters/network/test/mesh/command_handlers/api_versions_unit_test.cc
index bb8e33f1e61e..2a572bec507b 100644
--- a/test/extensions/filters/network/kafka/mesh/command_handlers/api_versions_unit_test.cc
+++ b/contrib/kafka/filters/network/test/mesh/command_handlers/api_versions_unit_test.cc
@@ -1,5 +1,4 @@
-#include "source/extensions/filters/network/kafka/mesh/command_handlers/api_versions.h"
-
+#include "contrib/kafka/filters/network/source/mesh/command_handlers/api_versions.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/kafka/mesh/command_handlers/metadata_unit_test.cc b/contrib/kafka/filters/network/test/mesh/command_handlers/metadata_unit_test.cc
similarity index 94%
rename from test/extensions/filters/network/kafka/mesh/command_handlers/metadata_unit_test.cc
rename to contrib/kafka/filters/network/test/mesh/command_handlers/metadata_unit_test.cc
index a60d566f0b08..d9ffda89635c 100644
--- a/test/extensions/filters/network/kafka/mesh/command_handlers/metadata_unit_test.cc
+++ b/contrib/kafka/filters/network/test/mesh/command_handlers/metadata_unit_test.cc
@@ -1,6 +1,5 @@
-#include "source/extensions/filters/network/kafka/external/responses.h"
-#include "source/extensions/filters/network/kafka/mesh/command_handlers/metadata.h"
-
+#include "contrib/kafka/filters/network/source/external/responses.h"
+#include "contrib/kafka/filters/network/source/mesh/command_handlers/metadata.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/kafka/mesh/filter_unit_test.cc b/contrib/kafka/filters/network/test/mesh/filter_unit_test.cc
similarity index 98%
rename from test/extensions/filters/network/kafka/mesh/filter_unit_test.cc
rename to contrib/kafka/filters/network/test/mesh/filter_unit_test.cc
index a977c5a8901a..521775ba1b0a 100644
--- a/test/extensions/filters/network/kafka/mesh/filter_unit_test.cc
+++ b/contrib/kafka/filters/network/test/mesh/filter_unit_test.cc
@@ -1,7 +1,6 @@
-#include "source/extensions/filters/network/kafka/mesh/filter.h"
-
 #include "test/mocks/network/mocks.h"
 
+#include "contrib/kafka/filters/network/source/mesh/filter.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/kafka/mesh/request_processor_unit_test.cc b/contrib/kafka/filters/network/test/mesh/request_processor_unit_test.cc
similarity index 89%
rename from test/extensions/filters/network/kafka/mesh/request_processor_unit_test.cc
rename to contrib/kafka/filters/network/test/mesh/request_processor_unit_test.cc
index a512633a993f..2bedce078d30 100644
--- a/test/extensions/filters/network/kafka/mesh/request_processor_unit_test.cc
+++ b/contrib/kafka/filters/network/test/mesh/request_processor_unit_test.cc
@@ -1,10 +1,9 @@
-#include "source/extensions/filters/network/kafka/mesh/abstract_command.h"
-#include "source/extensions/filters/network/kafka/mesh/command_handlers/api_versions.h"
-#include "source/extensions/filters/network/kafka/mesh/command_handlers/metadata.h"
-#include "source/extensions/filters/network/kafka/mesh/request_processor.h"
-
 #include "test/test_common/utility.h"
 
+#include "contrib/kafka/filters/network/source/mesh/abstract_command.h"
+#include "contrib/kafka/filters/network/source/mesh/command_handlers/api_versions.h"
+#include "contrib/kafka/filters/network/source/mesh/command_handlers/metadata.h"
+#include "contrib/kafka/filters/network/source/mesh/request_processor.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/kafka/message_utilities.h b/contrib/kafka/filters/network/test/message_utilities.h
similarity index 94%
rename from test/extensions/filters/network/kafka/message_utilities.h
rename to contrib/kafka/filters/network/test/message_utilities.h
index 6fc0e1728b21..00278094e2cc 100644
--- a/test/extensions/filters/network/kafka/message_utilities.h
+++ b/contrib/kafka/filters/network/test/message_utilities.h
@@ -2,8 +2,8 @@
 
 #include <vector>
 
-#include "source/extensions/filters/network/kafka/kafka_request.h"
-#include "source/extensions/filters/network/kafka/kafka_response.h"
+#include "contrib/kafka/filters/network/source/kafka_request.h"
+#include "contrib/kafka/filters/network/source/kafka_response.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/network/kafka/metrics_integration_test.cc b/contrib/kafka/filters/network/test/metrics_integration_test.cc
similarity index 89%
rename from test/extensions/filters/network/kafka/metrics_integration_test.cc
rename to contrib/kafka/filters/network/test/metrics_integration_test.cc
index 84a331a76003..47873fbfaeef 100644
--- a/test/extensions/filters/network/kafka/metrics_integration_test.cc
+++ b/contrib/kafka/filters/network/test/metrics_integration_test.cc
@@ -1,9 +1,8 @@
-#include "source/extensions/filters/network/kafka/external/request_metrics.h"
-#include "source/extensions/filters/network/kafka/external/response_metrics.h"
-
 #include "test/common/stats/stat_test_utility.h"
-#include "test/extensions/filters/network/kafka/message_utilities.h"
 
+#include "contrib/kafka/filters/network/source/external/request_metrics.h"
+#include "contrib/kafka/filters/network/source/external/response_metrics.h"
+#include "contrib/kafka/filters/network/test/message_utilities.h"
 #include "gtest/gtest.h"
 
 namespace Envoy {
diff --git a/test/extensions/filters/network/kafka/protocol/launcher.py b/contrib/kafka/filters/network/test/protocol/launcher.py
similarity index 95%
rename from test/extensions/filters/network/kafka/protocol/launcher.py
rename to contrib/kafka/filters/network/test/protocol/launcher.py
index 6894cecb4fea..8a428f42d374 100644
--- a/test/extensions/filters/network/kafka/protocol/launcher.py
+++ b/contrib/kafka/filters/network/test/protocol/launcher.py
@@ -2,7 +2,7 @@
 
 # Launcher for generating Kafka protocol tests.
 
-import source.extensions.filters.network.kafka.protocol.generator as generator
+import contrib.kafka.filters.network.source.protocol.generator as generator
 import sys
 import os
 
diff --git a/test/extensions/filters/network/kafka/protocol/request_codec_request_test_cc.j2 b/contrib/kafka/filters/network/test/protocol/request_codec_request_test_cc.j2
similarity index 90%
rename from test/extensions/filters/network/kafka/protocol/request_codec_request_test_cc.j2
rename to contrib/kafka/filters/network/test/protocol/request_codec_request_test_cc.j2
index 99b32400be79..5fe3e99d4f64 100644
--- a/test/extensions/filters/network/kafka/protocol/request_codec_request_test_cc.j2
+++ b/contrib/kafka/filters/network/test/protocol/request_codec_request_test_cc.j2
@@ -9,11 +9,11 @@
   - capture messages received in callback,
   - verify that captured messages are identical to the ones sent.
 #}
-#include "source/extensions/filters/network/kafka/external/requests.h"
-#include "source/extensions/filters/network/kafka/request_codec.h"
+#include "contrib/kafka/filters/network/source/external/requests.h"
+#include "contrib/kafka/filters/network/source/request_codec.h"
 
-#include "test/extensions/filters/network/kafka/buffer_based_test.h"
-#include "test/extensions/filters/network/kafka/serialization_utilities.h"
+#include "contrib/kafka/filters/network/test/buffer_based_test.h"
+#include "contrib/kafka/filters/network/test/serialization_utilities.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/kafka/protocol/request_utilities_cc.j2 b/contrib/kafka/filters/network/test/protocol/request_utilities_cc.j2
similarity index 94%
rename from test/extensions/filters/network/kafka/protocol/request_utilities_cc.j2
rename to contrib/kafka/filters/network/test/protocol/request_utilities_cc.j2
index 90a3ab46c894..a90796c0acc1 100644
--- a/test/extensions/filters/network/kafka/protocol/request_utilities_cc.j2
+++ b/contrib/kafka/filters/network/test/protocol/request_utilities_cc.j2
@@ -3,9 +3,9 @@
   This file contains implementation of request-related methods contained in 'message_utilities.h'.
 #}
 
-#include "test/extensions/filters/network/kafka/message_utilities.h"
+#include "contrib/kafka/filters/network/test/message_utilities.h"
 
-#include "source/extensions/filters/network/kafka/external/requests.h"
+#include "contrib/kafka/filters/network/source/external/requests.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/network/kafka/protocol/requests_test_cc.j2 b/contrib/kafka/filters/network/test/protocol/requests_test_cc.j2
similarity index 91%
rename from test/extensions/filters/network/kafka/protocol/requests_test_cc.j2
rename to contrib/kafka/filters/network/test/protocol/requests_test_cc.j2
index 4157eec181d2..9ce37e7cc602 100644
--- a/test/extensions/filters/network/kafka/protocol/requests_test_cc.j2
+++ b/contrib/kafka/filters/network/test/protocol/requests_test_cc.j2
@@ -3,10 +3,10 @@
   For every request, we want to check if it can be serialized and deserialized properly.
 #}
 
-#include "source/extensions/filters/network/kafka/external/requests.h"
-#include "source/extensions/filters/network/kafka/request_codec.h"
+#include "contrib/kafka/filters/network/source/external/requests.h"
+#include "contrib/kafka/filters/network/source/request_codec.h"
 
-#include "test/extensions/filters/network/kafka/buffer_based_test.h"
+#include "contrib/kafka/filters/network/test/buffer_based_test.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/extensions/filters/network/kafka/protocol/response_codec_response_test_cc.j2 b/contrib/kafka/filters/network/test/protocol/response_codec_response_test_cc.j2
similarity index 90%
rename from test/extensions/filters/network/kafka/protocol/response_codec_response_test_cc.j2
rename to contrib/kafka/filters/network/test/protocol/response_codec_response_test_cc.j2
index d03e40e2b853..bae7252e5c34 100644
--- a/test/extensions/filters/network/kafka/protocol/response_codec_response_test_cc.j2
+++ b/contrib/kafka/filters/network/test/protocol/response_codec_response_test_cc.j2
@@ -9,11 +9,11 @@
   - capture messages received in callback,
   - verify that captured messages are identical to the ones sent.
 #}
-#include "source/extensions/filters/network/kafka/external/responses.h"
-#include "source/extensions/filters/network/kafka/response_codec.h"
+#include "contrib/kafka/filters/network/source/external/responses.h"
+#include "contrib/kafka/filters/network/source/response_codec.h"
 
-#include "test/extensions/filters/network/kafka/buffer_based_test.h"
-#include "test/extensions/filters/network/kafka/serialization_utilities.h"
+#include "contrib/kafka/filters/network/test/buffer_based_test.h"
+#include "contrib/kafka/filters/network/test/serialization_utilities.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/kafka/protocol/response_utilities_cc.j2 b/contrib/kafka/filters/network/test/protocol/response_utilities_cc.j2
similarity index 94%
rename from test/extensions/filters/network/kafka/protocol/response_utilities_cc.j2
rename to contrib/kafka/filters/network/test/protocol/response_utilities_cc.j2
index af412270c185..cf41d02e3ca7 100644
--- a/test/extensions/filters/network/kafka/protocol/response_utilities_cc.j2
+++ b/contrib/kafka/filters/network/test/protocol/response_utilities_cc.j2
@@ -3,9 +3,9 @@
   This file contains implementation of response-related methods contained in 'message_utilities.h'.
 #}
 
-#include "test/extensions/filters/network/kafka/message_utilities.h"
+#include "contrib/kafka/filters/network/test/message_utilities.h"
 
-#include "source/extensions/filters/network/kafka/external/responses.h"
+#include "contrib/kafka/filters/network/source/external/responses.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/network/kafka/protocol/responses_test_cc.j2 b/contrib/kafka/filters/network/test/protocol/responses_test_cc.j2
similarity index 91%
rename from test/extensions/filters/network/kafka/protocol/responses_test_cc.j2
rename to contrib/kafka/filters/network/test/protocol/responses_test_cc.j2
index cf5d552721ac..c8673bcdbcd0 100644
--- a/test/extensions/filters/network/kafka/protocol/responses_test_cc.j2
+++ b/contrib/kafka/filters/network/test/protocol/responses_test_cc.j2
@@ -3,10 +3,10 @@
   For every response, we want to check if it can be serialized and deserialized properly.
 #}
 
-#include "source/extensions/filters/network/kafka/external/responses.h"
-#include "source/extensions/filters/network/kafka/response_codec.h"
+#include "contrib/kafka/filters/network/source/external/responses.h"
+#include "contrib/kafka/filters/network/source/response_codec.h"
 
-#include "test/extensions/filters/network/kafka/buffer_based_test.h"
+#include "contrib/kafka/filters/network/test/buffer_based_test.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/extensions/filters/network/kafka/request_codec_integration_test.cc b/contrib/kafka/filters/network/test/request_codec_integration_test.cc
similarity index 91%
rename from test/extensions/filters/network/kafka/request_codec_integration_test.cc
rename to contrib/kafka/filters/network/test/request_codec_integration_test.cc
index ceb475b45063..a907402b7643 100644
--- a/test/extensions/filters/network/kafka/request_codec_integration_test.cc
+++ b/contrib/kafka/filters/network/test/request_codec_integration_test.cc
@@ -1,8 +1,6 @@
-#include "source/extensions/filters/network/kafka/request_codec.h"
-
-#include "test/extensions/filters/network/kafka/buffer_based_test.h"
-#include "test/extensions/filters/network/kafka/serialization_utilities.h"
-
+#include "contrib/kafka/filters/network/source/request_codec.h"
+#include "contrib/kafka/filters/network/test/buffer_based_test.h"
+#include "contrib/kafka/filters/network/test/serialization_utilities.h"
 #include "gtest/gtest.h"
 
 namespace Envoy {
diff --git a/test/extensions/filters/network/kafka/request_codec_unit_test.cc b/contrib/kafka/filters/network/test/request_codec_unit_test.cc
similarity index 97%
rename from test/extensions/filters/network/kafka/request_codec_unit_test.cc
rename to contrib/kafka/filters/network/test/request_codec_unit_test.cc
index 0e6ad23ce5f0..95e8e9de7d3d 100644
--- a/test/extensions/filters/network/kafka/request_codec_unit_test.cc
+++ b/contrib/kafka/filters/network/test/request_codec_unit_test.cc
@@ -1,7 +1,5 @@
-#include "source/extensions/filters/network/kafka/request_codec.h"
-
-#include "test/extensions/filters/network/kafka/buffer_based_test.h"
-
+#include "contrib/kafka/filters/network/source/request_codec.h"
+#include "contrib/kafka/filters/network/test/buffer_based_test.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/kafka/response_codec_integration_test.cc b/contrib/kafka/filters/network/test/response_codec_integration_test.cc
similarity index 92%
rename from test/extensions/filters/network/kafka/response_codec_integration_test.cc
rename to contrib/kafka/filters/network/test/response_codec_integration_test.cc
index 191d738297f2..8fd41b5dd352 100644
--- a/test/extensions/filters/network/kafka/response_codec_integration_test.cc
+++ b/contrib/kafka/filters/network/test/response_codec_integration_test.cc
@@ -1,8 +1,6 @@
-#include "source/extensions/filters/network/kafka/response_codec.h"
-
-#include "test/extensions/filters/network/kafka/buffer_based_test.h"
-#include "test/extensions/filters/network/kafka/serialization_utilities.h"
-
+#include "contrib/kafka/filters/network/source/response_codec.h"
+#include "contrib/kafka/filters/network/test/buffer_based_test.h"
+#include "contrib/kafka/filters/network/test/serialization_utilities.h"
 #include "gtest/gtest.h"
 
 namespace Envoy {
diff --git a/test/extensions/filters/network/kafka/response_codec_unit_test.cc b/contrib/kafka/filters/network/test/response_codec_unit_test.cc
similarity index 97%
rename from test/extensions/filters/network/kafka/response_codec_unit_test.cc
rename to contrib/kafka/filters/network/test/response_codec_unit_test.cc
index d05f42e9a9a2..33797381d0a6 100644
--- a/test/extensions/filters/network/kafka/response_codec_unit_test.cc
+++ b/contrib/kafka/filters/network/test/response_codec_unit_test.cc
@@ -1,7 +1,5 @@
-#include "source/extensions/filters/network/kafka/response_codec.h"
-
-#include "test/extensions/filters/network/kafka/buffer_based_test.h"
-
+#include "contrib/kafka/filters/network/source/response_codec.h"
+#include "contrib/kafka/filters/network/test/buffer_based_test.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/extensions/filters/network/kafka/serialization/launcher.py b/contrib/kafka/filters/network/test/serialization/launcher.py
similarity index 90%
rename from test/extensions/filters/network/kafka/serialization/launcher.py
rename to contrib/kafka/filters/network/test/serialization/launcher.py
index 5efd339d687e..734705b797bd 100644
--- a/test/extensions/filters/network/kafka/serialization/launcher.py
+++ b/contrib/kafka/filters/network/test/serialization/launcher.py
@@ -2,7 +2,7 @@
 
 # Launcher for generating composite serializer tests.
 
-import source.extensions.filters.network.kafka.serialization.generator as generator
+import contrib.kafka.filters.network.source.serialization.generator as generator
 import sys
 import os
 
diff --git a/test/extensions/filters/network/kafka/serialization/serialization_composite_test_cc.j2 b/contrib/kafka/filters/network/test/serialization/serialization_composite_test_cc.j2
similarity index 94%
rename from test/extensions/filters/network/kafka/serialization/serialization_composite_test_cc.j2
rename to contrib/kafka/filters/network/test/serialization/serialization_composite_test_cc.j2
index 884f5dcfd81c..f943984a3a38 100644
--- a/test/extensions/filters/network/kafka/serialization/serialization_composite_test_cc.j2
+++ b/contrib/kafka/filters/network/test/serialization/serialization_composite_test_cc.j2
@@ -5,9 +5,9 @@
   Covers the corner case of 0 delegates, and then uses templating to create tests for 1..N cases.
 #}
 
-#include "source/extensions/filters/network/kafka/external/serialization_composite.h"
+#include "contrib/kafka/filters/network/source/external/serialization_composite.h"
 
-#include "test/extensions/filters/network/kafka/serialization_utilities.h"
+#include "contrib/kafka/filters/network/test/serialization_utilities.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/network/kafka/serialization_test.cc b/contrib/kafka/filters/network/test/serialization_test.cc
similarity index 99%
rename from test/extensions/filters/network/kafka/serialization_test.cc
rename to contrib/kafka/filters/network/test/serialization_test.cc
index 5a6a1ae7e89b..c177e86364dd 100644
--- a/test/extensions/filters/network/kafka/serialization_test.cc
+++ b/contrib/kafka/filters/network/test/serialization_test.cc
@@ -1,8 +1,8 @@
-#include "source/extensions/filters/network/kafka/tagged_fields.h"
-
-#include "test/extensions/filters/network/kafka/serialization_utilities.h"
 #include "test/test_common/utility.h"
 
+#include "contrib/kafka/filters/network/source/tagged_fields.h"
+#include "contrib/kafka/filters/network/test/serialization_utilities.h"
+
 namespace Envoy {
 namespace Extensions {
 namespace NetworkFilters {
diff --git a/test/extensions/filters/network/kafka/serialization_utilities.cc b/contrib/kafka/filters/network/test/serialization_utilities.cc
similarity index 90%
rename from test/extensions/filters/network/kafka/serialization_utilities.cc
rename to contrib/kafka/filters/network/test/serialization_utilities.cc
index 10d32b53ca7c..18ff3b3782d1 100644
--- a/test/extensions/filters/network/kafka/serialization_utilities.cc
+++ b/contrib/kafka/filters/network/test/serialization_utilities.cc
@@ -1,4 +1,4 @@
-#include "test/extensions/filters/network/kafka/serialization_utilities.h"
+#include "contrib/kafka/filters/network/test/serialization_utilities.h"
 
 namespace Envoy {
 namespace Extensions {
diff --git a/test/extensions/filters/network/kafka/serialization_utilities.h b/contrib/kafka/filters/network/test/serialization_utilities.h
similarity index 99%
rename from test/extensions/filters/network/kafka/serialization_utilities.h
rename to contrib/kafka/filters/network/test/serialization_utilities.h
index 4b063971f0c5..7752776ba0ec 100644
--- a/test/extensions/filters/network/kafka/serialization_utilities.h
+++ b/contrib/kafka/filters/network/test/serialization_utilities.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "source/common/buffer/buffer_impl.h"
-#include "source/extensions/filters/network/kafka/serialization.h"
 
 #include "absl/container/fixed_array.h"
 #include "absl/strings/string_view.h"
+#include "contrib/kafka/filters/network/source/serialization.h"
 #include "gtest/gtest.h"
 
 namespace Envoy {
diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst
index 85ae73657b11..403e6b9cbb1e 100644
--- a/docs/root/version_history/current.rst
+++ b/docs/root/version_history/current.rst
@@ -7,6 +7,8 @@ Incompatible Behavior Changes
 
 * contrib: the :ref:`squash filter <config_http_filters_squash>` has been moved to
   :ref:`contrib images <install_contrib>`.
+* contrib: the :ref:`kafka broker filter <config_network_filters_kafka_broker>` has been moved to
+  :ref:`contrib images <install_contrib>`.
 * ext_authz: fixed skipping authentication when returning either a direct response or a redirect. This behavior can be temporarily reverted by setting the ``envoy.reloadable_features.http_ext_authz_do_not_skip_direct_response_and_redirect`` runtime guard to false.
 
 Minor Behavior Changes
diff --git a/generated_api_shadow/BUILD b/generated_api_shadow/BUILD
index 044bc7d137a8..d61c9e486b81 100644
--- a/generated_api_shadow/BUILD
+++ b/generated_api_shadow/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/generated_api_shadow/envoy/extensions/filters/network/kafka_broker/v3/BUILD b/generated_api_shadow/contrib/envoy/extensions/filters/network/kafka_broker/v3/BUILD
similarity index 100%
rename from generated_api_shadow/envoy/extensions/filters/network/kafka_broker/v3/BUILD
rename to generated_api_shadow/contrib/envoy/extensions/filters/network/kafka_broker/v3/BUILD
diff --git a/generated_api_shadow/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto b/generated_api_shadow/contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto
similarity index 100%
rename from generated_api_shadow/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto
rename to generated_api_shadow/contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto
diff --git a/source/docs/network_filter_fuzzing.md b/source/docs/network_filter_fuzzing.md
index 8e40210cac24..e8fb490a0129 100644
--- a/source/docs/network_filter_fuzzing.md
+++ b/source/docs/network_filter_fuzzing.md
@@ -33,7 +33,6 @@ envoy_cc_fuzz_test(
     deps = [
         ":uber_writefilter_lib",
         "//source/common/config:utility_lib",
-        "//source/extensions/filters/network/kafka:kafka_broker_config_lib",
         "//source/extensions/filters/network/mongo_proxy:config",
         "//source/extensions/filters/network/mysql_proxy:config",
         "//source/extensions/filters/network/zookeeper_proxy:config",
diff --git a/source/extensions/extensions_build_config.bzl b/source/extensions/extensions_build_config.bzl
index 3f8dfeb00f0b..52ebaac2823b 100644
--- a/source/extensions/extensions_build_config.bzl
+++ b/source/extensions/extensions_build_config.bzl
@@ -131,7 +131,6 @@ EXTENSIONS = {
     "envoy.filters.network.echo":                                 "//source/extensions/filters/network/echo:config",
     "envoy.filters.network.ext_authz":                            "//source/extensions/filters/network/ext_authz:config",
     "envoy.filters.network.http_connection_manager":              "//source/extensions/filters/network/http_connection_manager:config",
-    "envoy.filters.network.kafka_broker":                         "//source/extensions/filters/network/kafka:kafka_broker_config_lib",
     "envoy.filters.network.local_ratelimit":                      "//source/extensions/filters/network/local_ratelimit:config",
     "envoy.filters.network.mongo_proxy":                          "//source/extensions/filters/network/mongo_proxy:config",
     "envoy.filters.network.mysql_proxy":                          "//source/extensions/filters/network/mysql_proxy:config",
diff --git a/source/extensions/extensions_metadata.yaml b/source/extensions/extensions_metadata.yaml
index 1eb2f7893642..85c03a9323ef 100644
--- a/source/extensions/extensions_metadata.yaml
+++ b/source/extensions/extensions_metadata.yaml
@@ -338,11 +338,6 @@ envoy.filters.network.envoy_mobile_http_connection_manager:
   - envoy.filters.network
   security_posture: robust_to_untrusted_downstream
   status: stable
-envoy.filters.network.kafka_broker:
-  categories:
-  - envoy.filters.network
-  security_posture: requires_trusted_downstream_and_upstream
-  status: wip
 envoy.filters.network.local_ratelimit:
   categories:
   - envoy.filters.network
diff --git a/source/extensions/filters/network/kafka/mesh/command_handlers/BUILD b/source/extensions/filters/network/kafka/mesh/command_handlers/BUILD
deleted file mode 100644
index abe69acab5c7..000000000000
--- a/source/extensions/filters/network/kafka/mesh/command_handlers/BUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-load(
-    "//bazel:envoy_build_system.bzl",
-    "envoy_cc_library",
-    "envoy_extension_package",
-)
-
-licenses(["notice"])  # Apache 2
-
-# Handlers for particular Kafka requests that are used by Kafka-mesh filter.
-
-envoy_extension_package()
-
-envoy_cc_library(
-    name = "metadata_lib",
-    srcs = [
-        "metadata.cc",
-    ],
-    hdrs = [
-        "metadata.h",
-    ],
-    tags = ["skip_on_windows"],
-    deps = [
-        "//source/common/common:minimal_logger_lib",
-        "//source/extensions/filters/network/kafka:kafka_request_parser_lib",
-        "//source/extensions/filters/network/kafka:kafka_response_parser_lib",
-        "//source/extensions/filters/network/kafka/mesh:abstract_command_lib",
-        "//source/extensions/filters/network/kafka/mesh:upstream_config_lib",
-    ],
-)
-
-envoy_cc_library(
-    name = "api_versions_lib",
-    srcs = [
-        "api_versions.cc",
-    ],
-    hdrs = [
-        "api_versions.h",
-    ],
-    tags = ["skip_on_windows"],
-    deps = [
-        "//source/common/common:minimal_logger_lib",
-        "//source/extensions/filters/network/kafka:kafka_request_parser_lib",
-        "//source/extensions/filters/network/kafka:kafka_response_parser_lib",
-        "//source/extensions/filters/network/kafka:tagged_fields_lib",
-        "//source/extensions/filters/network/kafka/mesh:abstract_command_lib",
-    ],
-)
diff --git a/test/extensions/filters/network/common/fuzz/BUILD b/test/extensions/filters/network/common/fuzz/BUILD
index c27cea334c5a..cab37d134b73 100644
--- a/test/extensions/filters/network/common/fuzz/BUILD
+++ b/test/extensions/filters/network/common/fuzz/BUILD
@@ -102,7 +102,6 @@ envoy_cc_fuzz_test(
     deps = [
         ":uber_writefilter_lib",
         "//source/common/config:utility_lib",
-        "//source/extensions/filters/network/kafka:kafka_broker_config_lib",
         "//source/extensions/filters/network/mongo_proxy:config",
         "//source/extensions/filters/network/mysql_proxy:config",
         "//source/extensions/filters/network/zookeeper_proxy:config",
diff --git a/test/extensions/filters/network/kafka/broker/BUILD b/test/extensions/filters/network/kafka/broker/BUILD
deleted file mode 100644
index 5abebe3f3485..000000000000
--- a/test/extensions/filters/network/kafka/broker/BUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-load(
-    "//bazel:envoy_build_system.bzl",
-    "envoy_package",
-)
-load(
-    "//test/extensions:extensions_build_system.bzl",
-    "envoy_extension_cc_test",
-)
-
-licenses(["notice"])  # Apache 2
-
-envoy_package()
-
-envoy_extension_cc_test(
-    name = "config_unit_test",
-    srcs = ["config_unit_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
-    deps = [
-        "//source/extensions/filters/network/kafka:kafka_broker_config_lib",
-        "//test/mocks/server:factory_context_mocks",
-    ],
-)
-
-envoy_extension_cc_test(
-    name = "filter_unit_test",
-    srcs = ["filter_unit_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
-    deps = [
-        "//envoy/event:timer_interface",
-        "//source/extensions/filters/network/kafka:kafka_broker_filter_lib",
-        "//test/mocks/network:network_mocks",
-        "//test/mocks/stats:stats_mocks",
-    ],
-)
-
-envoy_extension_cc_test(
-    name = "filter_protocol_test",
-    srcs = ["filter_protocol_test.cc"],
-    extension_names = ["envoy.filters.network.kafka_broker"],
-    deps = [
-        "//source/extensions/filters/network/kafka:kafka_broker_filter_lib",
-        "//test/common/stats:stat_test_utility_lib",
-        "//test/extensions/filters/network/kafka:buffer_based_test_lib",
-        "//test/extensions/filters/network/kafka:message_utilities",
-        "//test/test_common:test_time_lib",
-    ],
-)
diff --git a/test/extensions/filters/network/kafka/mesh/BUILD b/test/extensions/filters/network/kafka/mesh/BUILD
deleted file mode 100644
index ab7507ffef02..000000000000
--- a/test/extensions/filters/network/kafka/mesh/BUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-load(
-    "//bazel:envoy_build_system.bzl",
-    "envoy_package",
-)
-load(
-    "//test/extensions:extensions_build_system.bzl",
-    "envoy_extension_cc_test",
-)
-
-licenses(["notice"])  # Apache 2
-
-envoy_package()
-
-envoy_extension_cc_test(
-    name = "filter_unit_test",
-    srcs = ["filter_unit_test.cc"],
-    # This name needs to be changed after we have the mesh filter ready.
-    extension_names = ["envoy.filters.network.kafka_broker"],
-    tags = ["skip_on_windows"],
-    deps = [
-        "//source/extensions/filters/network/kafka/mesh:filter_lib",
-        "//test/mocks/network:network_mocks",
-    ],
-)
-
-envoy_extension_cc_test(
-    name = "request_processor_unit_test",
-    srcs = ["request_processor_unit_test.cc"],
-    # This name needs to be changed after we have the mesh filter ready.
-    extension_names = ["envoy.filters.network.kafka_broker"],
-    tags = ["skip_on_windows"],
-    deps = [
-        "//source/extensions/filters/network/kafka/mesh:request_processor_lib",
-    ],
-)
-
-envoy_extension_cc_test(
-    name = "abstract_command_unit_test",
-    srcs = ["abstract_command_unit_test.cc"],
-    # This name needs to be changed after we have the mesh filter ready.
-    extension_names = ["envoy.filters.network.kafka_broker"],
-    tags = ["skip_on_windows"],
-    deps = [
-        "//source/extensions/filters/network/kafka/mesh:abstract_command_lib",
-    ],
-)
diff --git a/test/extensions/filters/network/kafka/mesh/command_handlers/BUILD b/test/extensions/filters/network/kafka/mesh/command_handlers/BUILD
deleted file mode 100644
index ec4c387eb04b..000000000000
--- a/test/extensions/filters/network/kafka/mesh/command_handlers/BUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-load(
-    "//bazel:envoy_build_system.bzl",
-    "envoy_package",
-)
-load(
-    "//test/extensions:extensions_build_system.bzl",
-    "envoy_extension_cc_test",
-)
-
-licenses(["notice"])  # Apache 2
-
-envoy_package()
-
-envoy_extension_cc_test(
-    name = "metadata_unit_test",
-    srcs = ["metadata_unit_test.cc"],
-    # This name needs to be changed after we have the mesh filter ready.
-    extension_names = ["envoy.filters.network.kafka_broker"],
-    tags = ["skip_on_windows"],
-    deps = [
-        "//source/extensions/filters/network/kafka/mesh/command_handlers:metadata_lib",
-        "//test/mocks/network:network_mocks",
-        "//test/mocks/stats:stats_mocks",
-    ],
-)
-
-envoy_extension_cc_test(
-    name = "api_versions_unit_test",
-    srcs = ["api_versions_unit_test.cc"],
-    # This name needs to be changed after we have the mesh filter ready.
-    extension_names = ["envoy.filters.network.kafka_broker"],
-    tags = ["skip_on_windows"],
-    deps = [
-        "//source/extensions/filters/network/kafka/mesh/command_handlers:api_versions_lib",
-        "//test/mocks/network:network_mocks",
-        "//test/mocks/stats:stats_mocks",
-    ],
-)
diff --git a/tools/proto_format/proto_sync.py b/tools/proto_format/proto_sync.py
index 6eae2561420b..3fcdd7320a6d 100755
--- a/tools/proto_format/proto_sync.py
+++ b/tools/proto_format/proto_sync.py
@@ -43,8 +43,9 @@
 
 # Each of the following contrib extensions are allowed to be in the v3 namespace. Indicate why.
 CONTRIB_V3_ALLOW_LIST = [
-    # Extension moved from core to contrib.
+    # Extensions moved from core to contrib.
     'envoy.extensions.filters.http.squash.v3',
+    'envoy.extensions.filters.network.kafka_broker.v3',
 ]
 
 BUILD_FILE_TEMPLATE = string.Template(