diff --git a/BUILD b/BUILD
index 93f9184a..0a3d7c74 100644
--- a/BUILD
+++ b/BUILD
@@ -68,6 +68,7 @@ proto_library(
         "//envoy/config/accesslog/v3:pkg",
         "//envoy/config/bootstrap/v3:pkg",
         "//envoy/config/cluster/v3:pkg",
+        "//envoy/config/common/key_value/v3:pkg",
         "//envoy/config/common/matcher/v3:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/config/endpoint/v3:pkg",
@@ -101,7 +102,6 @@ proto_library(
         "//envoy/extensions/clusters/dynamic_forward_proxy/v3:pkg",
         "//envoy/extensions/clusters/redis/v3:pkg",
         "//envoy/extensions/common/dynamic_forward_proxy/v3:pkg",
-        "//envoy/extensions/common/key_value/v3:pkg",
         "//envoy/extensions/common/matching/v3:pkg",
         "//envoy/extensions/common/ratelimit/v3:pkg",
         "//envoy/extensions/common/tap/v3:pkg",
diff --git a/envoy/extensions/common/key_value/v3/BUILD b/envoy/config/common/key_value/v3/BUILD
similarity index 100%
rename from envoy/extensions/common/key_value/v3/BUILD
rename to envoy/config/common/key_value/v3/BUILD
diff --git a/envoy/extensions/common/key_value/v3/config.proto b/envoy/config/common/key_value/v3/config.proto
similarity index 69%
rename from envoy/extensions/common/key_value/v3/config.proto
rename to envoy/config/common/key_value/v3/config.proto
index 66a55435..39bf79fe 100644
--- a/envoy/extensions/common/key_value/v3/config.proto
+++ b/envoy/config/common/key_value/v3/config.proto
@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package envoy.extensions.common.key_value.v3;
+package envoy.config.common.key_value.v3;
 
 import "envoy/config/core/v3/extension.proto";
 
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.extensions.common.key_value.v3";
+option java_package = "io.envoyproxy.envoy.config.common.key_value.v3";
 option java_outer_classname = "ConfigProto";
 option java_multiple_files = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
@@ -18,5 +18,5 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 // This shared configuration for Envoy key value stores.
 message KeyValueStoreConfig {
   // [#extension-category: envoy.common.key_value]
-  config.core.v3.TypedExtensionConfig config = 1 [(validate.rules).message = {required: true}];
+  core.v3.TypedExtensionConfig config = 1 [(validate.rules).message = {required: true}];
 }
diff --git a/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD b/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD
index 6e07b4a9..b9cc22c7 100644
--- a/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD
+++ b/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD
@@ -8,8 +8,8 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/config/cluster/v3:pkg",
+        "//envoy/config/common/key_value/v3:pkg",
         "//envoy/config/core/v3:pkg",
-        "//envoy/extensions/common/key_value/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.proto b/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.proto
index 4a0d87ff..e3904ae2 100644
--- a/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.proto
+++ b/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.proto
@@ -3,10 +3,10 @@ syntax = "proto3";
 package envoy.extensions.common.dynamic_forward_proxy.v3;
 
 import "envoy/config/cluster/v3/cluster.proto";
+import "envoy/config/common/key_value/v3/config.proto";
 import "envoy/config/core/v3/address.proto";
 import "envoy/config/core/v3/extension.proto";
 import "envoy/config/core/v3/resolver.proto";
-import "envoy/extensions/common/key_value/v3/config.proto";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/wrappers.proto";
@@ -142,5 +142,5 @@ message DnsCacheConfig {
 
   // [#not-implemented-hide:]
   // Configuration to flush the DNS cache to long term storage.
-  key_value.v3.KeyValueStoreConfig key_value_config = 13;
+  config.common.key_value.v3.KeyValueStoreConfig key_value_config = 13;
 }
diff --git a/versioning/BUILD b/versioning/BUILD
index 61af4c47..c57ddbb5 100644
--- a/versioning/BUILD
+++ b/versioning/BUILD
@@ -20,6 +20,7 @@ proto_library(
         "//envoy/config/accesslog/v3:pkg",
         "//envoy/config/bootstrap/v3:pkg",
         "//envoy/config/cluster/v3:pkg",
+        "//envoy/config/common/key_value/v3:pkg",
         "//envoy/config/common/matcher/v3:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/config/endpoint/v3:pkg",
@@ -53,7 +54,6 @@ proto_library(
         "//envoy/extensions/clusters/dynamic_forward_proxy/v3:pkg",
         "//envoy/extensions/clusters/redis/v3:pkg",
         "//envoy/extensions/common/dynamic_forward_proxy/v3:pkg",
-        "//envoy/extensions/common/key_value/v3:pkg",
         "//envoy/extensions/common/matching/v3:pkg",
         "//envoy/extensions/common/ratelimit/v3:pkg",
         "//envoy/extensions/common/tap/v3:pkg",