diff --git a/packages/kubernetes/changelog.yml b/packages/kubernetes/changelog.yml
index 560b9c52dc0..cf7277ac502 100644
--- a/packages/kubernetes/changelog.yml
+++ b/packages/kubernetes/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: 1.64.0
+  changes:
+    - description: Move namespace filter to the group level configuration
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/10213
 - version: 1.63.1
   changes:
     - description: Fix typo in kubernetes.audit ingest pipeline
diff --git a/packages/kubernetes/data_stream/container/agent/stream/stream.yml.hbs b/packages/kubernetes/data_stream/container/agent/stream/stream.yml.hbs
index ca56f86c578..42147b54c99 100644
--- a/packages/kubernetes/data_stream/container/agent/stream/stream.yml.hbs
+++ b/packages/kubernetes/data_stream/container/agent/stream/stream.yml.hbs
@@ -18,6 +18,9 @@ ssl.certificate_authorities:
   - {{this}}
 {{/each}}
 {{/if}}
+{{#if namespace}}
+namespace: {{namespace}}
+{{/if}}
 
 {{#if processors}}
 processors:
diff --git a/packages/kubernetes/data_stream/event/agent/stream/stream.yml.hbs b/packages/kubernetes/data_stream/event/agent/stream/stream.yml.hbs
index 9e356defdbf..6fc74575711 100644
--- a/packages/kubernetes/data_stream/event/agent/stream/stream.yml.hbs
+++ b/packages/kubernetes/data_stream/event/agent/stream/stream.yml.hbs
@@ -13,6 +13,9 @@ condition: ${kubernetes_leaderelection.leader} == true
 condition: {{ condition }}
 {{/if}}
 {{/if}}
+{{#if namespace}}
+namespace: {{namespace}}
+{{/if}}
 
 {{#if processors}}
 processors:
diff --git a/packages/kubernetes/data_stream/pod/agent/stream/stream.yml.hbs b/packages/kubernetes/data_stream/pod/agent/stream/stream.yml.hbs
index 91a99e5ff07..ee0bef2b06f 100644
--- a/packages/kubernetes/data_stream/pod/agent/stream/stream.yml.hbs
+++ b/packages/kubernetes/data_stream/pod/agent/stream/stream.yml.hbs
@@ -18,6 +18,9 @@ ssl.certificate_authorities:
   - {{this}}
 {{/each}}
 {{/if}}
+{{#if namespace}}
+namespace: {{namespace}}
+{{/if}}
 
 {{#if processors}}
 processors:
diff --git a/packages/kubernetes/data_stream/state_container/manifest.yml b/packages/kubernetes/data_stream/state_container/manifest.yml
index 735ad697880..1cc50a6e831 100644
--- a/packages/kubernetes/data_stream/state_container/manifest.yml
+++ b/packages/kubernetes/data_stream/state_container/manifest.yml
@@ -41,12 +41,6 @@ streams:
         multi: false
         required: false
         show_user: false
-      - name: namespace
-        type: text
-        title: Namespace to watch resources from for metadata
-        multi: false
-        required: false
-        show_user: false
       - name: bearer_token_file
         type: text
         title: Bearer Token File
diff --git a/packages/kubernetes/data_stream/state_cronjob/manifest.yml b/packages/kubernetes/data_stream/state_cronjob/manifest.yml
index 0bd4bc54772..ba454a325f1 100644
--- a/packages/kubernetes/data_stream/state_cronjob/manifest.yml
+++ b/packages/kubernetes/data_stream/state_cronjob/manifest.yml
@@ -41,12 +41,6 @@ streams:
         multi: false
         required: false
         show_user: false
-      - name: namespace
-        type: text
-        title: Namespace to watch resources from for metadata
-        multi: false
-        required: false
-        show_user: false
       - name: bearer_token_file
         type: text
         title: Bearer Token File
diff --git a/packages/kubernetes/data_stream/state_daemonset/manifest.yml b/packages/kubernetes/data_stream/state_daemonset/manifest.yml
index b261bd14bde..81cfa65431d 100644
--- a/packages/kubernetes/data_stream/state_daemonset/manifest.yml
+++ b/packages/kubernetes/data_stream/state_daemonset/manifest.yml
@@ -41,12 +41,6 @@ streams:
         multi: false
         required: false
         show_user: false
-      - name: namespace
-        type: text
-        title: Namespace to watch resources from for metadata
-        multi: false
-        required: false
-        show_user: false
       - name: bearer_token_file
         type: text
         title: Bearer Token File
diff --git a/packages/kubernetes/data_stream/state_deployment/manifest.yml b/packages/kubernetes/data_stream/state_deployment/manifest.yml
index 003633adec9..c5a1c0a72e5 100644
--- a/packages/kubernetes/data_stream/state_deployment/manifest.yml
+++ b/packages/kubernetes/data_stream/state_deployment/manifest.yml
@@ -41,12 +41,6 @@ streams:
         multi: false
         required: false
         show_user: false
-      - name: namespace
-        type: text
-        title: Namespace to watch resources from for metadata
-        multi: false
-        required: false
-        show_user: false
       - name: bearer_token_file
         type: text
         title: Bearer Token File
diff --git a/packages/kubernetes/data_stream/state_job/manifest.yml b/packages/kubernetes/data_stream/state_job/manifest.yml
index 2fcc1f76139..40d982e6fbe 100644
--- a/packages/kubernetes/data_stream/state_job/manifest.yml
+++ b/packages/kubernetes/data_stream/state_job/manifest.yml
@@ -41,12 +41,6 @@ streams:
         multi: false
         required: false
         show_user: false
-      - name: namespace
-        type: text
-        title: Namespace to watch resources from for metadata
-        multi: false
-        required: false
-        show_user: false
       - name: bearer_token_file
         type: text
         title: Bearer Token File
diff --git a/packages/kubernetes/data_stream/state_namespace/manifest.yml b/packages/kubernetes/data_stream/state_namespace/manifest.yml
index 220b164fd40..a79ac40fd13 100644
--- a/packages/kubernetes/data_stream/state_namespace/manifest.yml
+++ b/packages/kubernetes/data_stream/state_namespace/manifest.yml
@@ -41,12 +41,6 @@ streams:
         multi: false
         required: false
         show_user: false
-      - name: namespace
-        type: text
-        title: Namespace to watch resources from for metadata
-        multi: false
-        required: false
-        show_user: false
       - name: bearer_token_file
         type: text
         title: Bearer Token File
diff --git a/packages/kubernetes/data_stream/state_node/agent/stream/stream.yml.hbs b/packages/kubernetes/data_stream/state_node/agent/stream/stream.yml.hbs
index a36159c01fb..cab92e32177 100644
--- a/packages/kubernetes/data_stream/state_node/agent/stream/stream.yml.hbs
+++ b/packages/kubernetes/data_stream/state_node/agent/stream/stream.yml.hbs
@@ -19,9 +19,6 @@ condition: {{ condition }}
 {{#if node}}
 node: {{node}}
 {{/if}}
-{{#if namespace}}
-namespace: {{namespace}}
-{{/if}}
 {{#if bearer_token_file}}
 bearer_token_file: {{bearer_token_file}}
 {{/if}}
diff --git a/packages/kubernetes/data_stream/state_node/manifest.yml b/packages/kubernetes/data_stream/state_node/manifest.yml
index a40bddac80b..9232ec1819e 100644
--- a/packages/kubernetes/data_stream/state_node/manifest.yml
+++ b/packages/kubernetes/data_stream/state_node/manifest.yml
@@ -41,12 +41,6 @@ streams:
         multi: false
         required: false
         show_user: false
-      - name: namespace
-        type: text
-        title: Namespace to watch resources from for metadata
-        multi: false
-        required: false
-        show_user: false
       - name: bearer_token_file
         type: text
         title: Bearer Token File
diff --git a/packages/kubernetes/data_stream/state_persistentvolume/agent/stream/stream.yml.hbs b/packages/kubernetes/data_stream/state_persistentvolume/agent/stream/stream.yml.hbs
index 3dcec11ee16..e7c651bb283 100644
--- a/packages/kubernetes/data_stream/state_persistentvolume/agent/stream/stream.yml.hbs
+++ b/packages/kubernetes/data_stream/state_persistentvolume/agent/stream/stream.yml.hbs
@@ -19,9 +19,6 @@ condition: {{ condition }}
 {{#if node}}
 node: {{node}}
 {{/if}}
-{{#if namespace}}
-namespace: {{namespace}}
-{{/if}}
 {{#if bearer_token_file}}
 bearer_token_file: {{bearer_token_file}}
 {{/if}}
diff --git a/packages/kubernetes/data_stream/state_persistentvolume/manifest.yml b/packages/kubernetes/data_stream/state_persistentvolume/manifest.yml
index cf40b357fc0..87d8a4f850d 100644
--- a/packages/kubernetes/data_stream/state_persistentvolume/manifest.yml
+++ b/packages/kubernetes/data_stream/state_persistentvolume/manifest.yml
@@ -41,12 +41,6 @@ streams:
         multi: false
         required: false
         show_user: false
-      - name: namespace
-        type: text
-        title: Namespace to watch resources from for metadata
-        multi: false
-        required: false
-        show_user: false
       - name: bearer_token_file
         type: text
         title: Bearer Token File
diff --git a/packages/kubernetes/data_stream/state_persistentvolumeclaim/manifest.yml b/packages/kubernetes/data_stream/state_persistentvolumeclaim/manifest.yml
index 41fe7a94554..74b92738bee 100644
--- a/packages/kubernetes/data_stream/state_persistentvolumeclaim/manifest.yml
+++ b/packages/kubernetes/data_stream/state_persistentvolumeclaim/manifest.yml
@@ -41,12 +41,6 @@ streams:
         multi: false
         required: false
         show_user: false
-      - name: namespace
-        type: text
-        title: Namespace to watch resources from for metadata
-        multi: false
-        required: false
-        show_user: false
       - name: bearer_token_file
         type: text
         title: Bearer Token File
diff --git a/packages/kubernetes/data_stream/state_pod/manifest.yml b/packages/kubernetes/data_stream/state_pod/manifest.yml
index d854b774487..4288cf6d8c0 100644
--- a/packages/kubernetes/data_stream/state_pod/manifest.yml
+++ b/packages/kubernetes/data_stream/state_pod/manifest.yml
@@ -41,12 +41,6 @@ streams:
         multi: false
         required: false
         show_user: false
-      - name: namespace
-        type: text
-        title: Namespace to watch resources from for metadata
-        multi: false
-        required: false
-        show_user: false
       - name: bearer_token_file
         type: text
         title: Bearer Token File
diff --git a/packages/kubernetes/data_stream/state_replicaset/manifest.yml b/packages/kubernetes/data_stream/state_replicaset/manifest.yml
index 78bfeecf1be..3faa5d39241 100644
--- a/packages/kubernetes/data_stream/state_replicaset/manifest.yml
+++ b/packages/kubernetes/data_stream/state_replicaset/manifest.yml
@@ -41,12 +41,6 @@ streams:
         multi: false
         required: false
         show_user: false
-      - name: namespace
-        type: text
-        title: Namespace to watch resources from for metadata
-        multi: false
-        required: false
-        show_user: false
       - name: bearer_token_file
         type: text
         title: Bearer Token File
diff --git a/packages/kubernetes/data_stream/state_resourcequota/agent/stream/stream.yml.hbs b/packages/kubernetes/data_stream/state_resourcequota/agent/stream/stream.yml.hbs
index 7472d90ae20..8de84c20411 100644
--- a/packages/kubernetes/data_stream/state_resourcequota/agent/stream/stream.yml.hbs
+++ b/packages/kubernetes/data_stream/state_resourcequota/agent/stream/stream.yml.hbs
@@ -19,9 +19,6 @@ condition: {{ condition }}
 {{#if node}}
 node: {{node}}
 {{/if}}
-{{#if namespace}}
-namespace: {{namespace}}
-{{/if}}
 {{#if bearer_token_file}}
 bearer_token_file: {{bearer_token_file}}
 {{/if}}
diff --git a/packages/kubernetes/data_stream/state_resourcequota/manifest.yml b/packages/kubernetes/data_stream/state_resourcequota/manifest.yml
index 63fb14fa966..edfae8bb8fb 100644
--- a/packages/kubernetes/data_stream/state_resourcequota/manifest.yml
+++ b/packages/kubernetes/data_stream/state_resourcequota/manifest.yml
@@ -41,12 +41,6 @@ streams:
         multi: false
         required: false
         show_user: false
-      - name: namespace
-        type: text
-        title: Namespace to watch resources from for metadata
-        multi: false
-        required: false
-        show_user: false
       - name: bearer_token_file
         type: text
         title: Bearer Token File
diff --git a/packages/kubernetes/data_stream/state_service/manifest.yml b/packages/kubernetes/data_stream/state_service/manifest.yml
index c7eca8a1cdf..fff5551b0e7 100644
--- a/packages/kubernetes/data_stream/state_service/manifest.yml
+++ b/packages/kubernetes/data_stream/state_service/manifest.yml
@@ -41,12 +41,6 @@ streams:
         multi: false
         required: false
         show_user: false
-      - name: namespace
-        type: text
-        title: Namespace to watch resources from for metadata
-        multi: false
-        required: false
-        show_user: false
       - name: bearer_token_file
         type: text
         title: Bearer Token File
diff --git a/packages/kubernetes/data_stream/state_statefulset/manifest.yml b/packages/kubernetes/data_stream/state_statefulset/manifest.yml
index 6485550f302..29b4c5b6951 100644
--- a/packages/kubernetes/data_stream/state_statefulset/manifest.yml
+++ b/packages/kubernetes/data_stream/state_statefulset/manifest.yml
@@ -41,12 +41,6 @@ streams:
         multi: false
         required: false
         show_user: false
-      - name: namespace
-        type: text
-        title: Namespace to watch resources from for metadata
-        multi: false
-        required: false
-        show_user: false
       - name: bearer_token_file
         type: text
         title: Bearer Token File
diff --git a/packages/kubernetes/data_stream/state_storageclass/agent/stream/stream.yml.hbs b/packages/kubernetes/data_stream/state_storageclass/agent/stream/stream.yml.hbs
index 49b339e53e2..48e3d4fd7ab 100644
--- a/packages/kubernetes/data_stream/state_storageclass/agent/stream/stream.yml.hbs
+++ b/packages/kubernetes/data_stream/state_storageclass/agent/stream/stream.yml.hbs
@@ -19,9 +19,6 @@ condition: {{ condition }}
 {{#if node}}
 node: {{node}}
 {{/if}}
-{{#if namespace}}
-namespace: {{namespace}}
-{{/if}}
 {{#if bearer_token_file}}
 bearer_token_file: {{bearer_token_file}}
 {{/if}}
diff --git a/packages/kubernetes/data_stream/state_storageclass/manifest.yml b/packages/kubernetes/data_stream/state_storageclass/manifest.yml
index 0120b7c4e8a..efa86393f24 100644
--- a/packages/kubernetes/data_stream/state_storageclass/manifest.yml
+++ b/packages/kubernetes/data_stream/state_storageclass/manifest.yml
@@ -41,12 +41,6 @@ streams:
         multi: false
         required: false
         show_user: false
-      - name: namespace
-        type: text
-        title: Namespace to watch resources from for metadata
-        multi: false
-        required: false
-        show_user: false
       - name: bearer_token_file
         type: text
         title: Bearer Token File
diff --git a/packages/kubernetes/manifest.yml b/packages/kubernetes/manifest.yml
index a1143a031e4..2c9836865bb 100644
--- a/packages/kubernetes/manifest.yml
+++ b/packages/kubernetes/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 3.1.2
 name: kubernetes
 title: Kubernetes
-version: 1.63.1
+version: 1.64.0
 description: Collect logs and metrics from Kubernetes clusters with Elastic Agent.
 type: integration
 categories:
@@ -46,6 +46,13 @@ policy_templates:
             multi: false
             required: false
             show_user: false
+          - name: namespace
+            type: text
+            title: Namespace
+            description: Enrich events with metadata from the resources in this namespace. Empty value means all namespaces.
+            multi: false
+            required: false
+            show_user: false
     icons:
       - src: /img/logo_kubernetes.svg
         title: Logo Kubernetes
@@ -88,6 +95,13 @@ policy_templates:
             multi: false
             required: false
             show_user: false
+          - name: namespace
+            type: text
+            title: Namespace
+            description: Enrich events with metadata from the resources in this namespace. Empty value means all namespaces.
+            multi: false
+            required: false
+            show_user: false
     icons:
       - src: /img/logo_kubernetes.svg
         title: Logo Kubernetes
@@ -188,6 +202,14 @@ policy_templates:
         title: Collect Kubernetes events from Kubernetes API Server
         description: Collecting events from Kubernetes API Server
         input_group: metrics
+        vars:
+          - name: namespace
+            type: text
+            title: Namespace
+            description: Enrich events with metadata from the resources in this namespace. Empty value means all namespaces.
+            multi: false
+            required: false
+            show_user: false
     icons:
       - src: /img/logo_kubernetes.svg
         title: Logo Kubernetes