diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8844af4ce0f..713f33dfed0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -36,7 +36,8 @@ exporter/otlpexporter/                   @open-telemetry/collector-approvers
 exporter/otlphttpexporter/               @open-telemetry/collector-approvers
 exporter/xexporter/                      @open-telemetry/collector-approvers @mx-psi @dmathieu
 extension/memorylimiterextension/        @open-telemetry/collector-approvers
-extension/xextension/                    @open-telemetry/collector-approvers @swiatekm
+extension/xextension/                    @open-telemetry/collector-approvers
+extension/xextension/storage/            @open-telemetry/collector-approvers @swiatekm
 extension/zpagesextension/               @open-telemetry/collector-approvers
 pdata/                                   @open-telemetry/collector-approvers @BogdanDrutu @dmitryax
 pdata/pprofile/                          @open-telemetry/collector-approvers @mx-psi @dmathieu
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index d30d55a62ad..d2a517f63b2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -37,6 +37,7 @@ body:
       - exporter/x
       - extension/memorylimiter
       - extension/x
+      - extension/x/storage
       - extension/zpages
       - pdata
       - pdata/pprofile
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index b1467affb97..a8aaa3cca6f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -31,6 +31,7 @@ body:
       - exporter/x
       - extension/memorylimiter
       - extension/x
+      - extension/x/storage
       - extension/zpages
       - pdata
       - pdata/pprofile
diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml
index a944ce3475b..0f76cfcd95c 100644
--- a/.github/ISSUE_TEMPLATE/other.yaml
+++ b/.github/ISSUE_TEMPLATE/other.yaml
@@ -30,6 +30,7 @@ body:
       - exporter/x
       - extension/memorylimiter
       - extension/x
+      - extension/x/storage
       - extension/zpages
       - pdata
       - pdata/pprofile
diff --git a/extension/xextension/metadata.yaml b/extension/xextension/metadata.yaml
index 54634a117cc..95d46802259 100644
--- a/extension/xextension/metadata.yaml
+++ b/extension/xextension/metadata.yaml
@@ -4,7 +4,5 @@ github_project: open-telemetry/opentelemetry-collector
 status:
   class: extension
   codeowners:
-    active:
-      - swiatekm
   stability:
     development: [profiles]
diff --git a/extension/xextension/storage/metadata.yaml b/extension/xextension/storage/metadata.yaml
new file mode 100644
index 00000000000..54634a117cc
--- /dev/null
+++ b/extension/xextension/storage/metadata.yaml
@@ -0,0 +1,10 @@
+type: xextension
+github_project: open-telemetry/opentelemetry-collector
+
+status:
+  class: extension
+  codeowners:
+    active:
+      - swiatekm
+  stability:
+    development: [profiles]