diff --git a/BUILD b/BUILD
index 1359163e..e28c8f3e 100644
--- a/BUILD
+++ b/BUILD
@@ -78,7 +78,9 @@ proto_library(
         "//contrib/envoy/extensions/filters/http/sxg/v3alpha:pkg",
         "//contrib/envoy/extensions/filters/network/client_ssl_auth/v3:pkg",
         "//contrib/envoy/extensions/filters/network/generic_proxy/action/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3:pkg",
         "//contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/generic_proxy/router/v3:pkg",
         "//contrib/envoy/extensions/filters/network/generic_proxy/v3:pkg",
         "//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg",
         "//contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha:pkg",
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/BUILD b/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/BUILD
new file mode 100644
index 00000000..ec1e778e
--- /dev/null
+++ b/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/BUILD
@@ -0,0 +1,12 @@
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
+
+load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
+
+licenses(["notice"])  # Apache 2
+
+api_proto_package(
+    deps = [
+        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+    ],
+)
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto b/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto
new file mode 100644
index 00000000..d5b6782e
--- /dev/null
+++ b/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto
@@ -0,0 +1,20 @@
+syntax = "proto3";
+
+package envoy.extensions.filters.network.generic_proxy.codecs.dubbo.v3;
+
+import "xds/annotations/v3/status.proto";
+
+import "udpa/annotations/status.proto";
+
+option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.codecs.dubbo.v3";
+option java_outer_classname = "DubboProto";
+option java_multiple_files = true;
+option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3;dubbov3";
+option (udpa.annotations.file_status).package_version_status = ACTIVE;
+option (xds.annotations.v3.file_status).work_in_progress = true;
+
+// [#protodoc-title: Dubbo codec configuration for Generic Proxy]
+// [#extension: envoy.generic_proxy.codecs.dubbo]
+
+message DubboCodecConfig {
+}
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/router/v3/router.proto b/contrib/envoy/extensions/filters/network/generic_proxy/router/v3/router.proto
index 4f891be0..308943dc 100644
--- a/contrib/envoy/extensions/filters/network/generic_proxy/router/v3/router.proto
+++ b/contrib/envoy/extensions/filters/network/generic_proxy/router/v3/router.proto
@@ -14,6 +14,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 
 // [#protodoc-title: Router for generic proxy]
+// [#extension: envoy.filters.generic.router]
 
 message Router {
 }
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto b/contrib/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto
index bc60e326..7ba257ce 100644
--- a/contrib/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto
+++ b/contrib/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto
@@ -28,6 +28,7 @@ message GenericProxy {
   string stat_prefix = 1 [(validate.rules).string = {min_len: 1}];
 
   // The codec which encodes and decodes the application protocol.
+  // [#extension-category: envoy.generic_proxy.codecs]
   config.core.v3.TypedExtensionConfig codec_config = 2
       [(validate.rules).message = {required: true}];
 
@@ -45,6 +46,7 @@ message GenericProxy {
   // A list of individual Layer-7 filters that make up the filter chain for requests made to the
   // proxy. Order matters as the filters are processed sequentially as request events
   // happen.
+  // [#extension-category: envoy.generic_proxy.filters]
   repeated config.core.v3.TypedExtensionConfig filters = 5;
 }
 
diff --git a/versioning/BUILD b/versioning/BUILD
index b21b5f6d..28dd2b0a 100644
--- a/versioning/BUILD
+++ b/versioning/BUILD
@@ -16,6 +16,7 @@ proto_library(
         "//contrib/envoy/extensions/filters/http/sxg/v3alpha:pkg",
         "//contrib/envoy/extensions/filters/network/client_ssl_auth/v3:pkg",
         "//contrib/envoy/extensions/filters/network/generic_proxy/action/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3:pkg",
         "//contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3:pkg",
         "//contrib/envoy/extensions/filters/network/generic_proxy/router/v3:pkg",
         "//contrib/envoy/extensions/filters/network/generic_proxy/v3:pkg",