diff --git a/package/endpoint/data_stream/action_responses/manifest.yml b/package/endpoint/data_stream/action_responses/manifest.yml
index c119ce706..9f39671a3 100644
--- a/package/endpoint/data_stream/action_responses/manifest.yml
+++ b/package/endpoint/data_stream/action_responses/manifest.yml
@@ -6,3 +6,5 @@ elasticsearch:
   index_template:
     mappings:
       dynamic: false
+  dynamic_dataset: true
+  dynamic_namespace: true
\ No newline at end of file
diff --git a/package/endpoint/data_stream/actions/manifest.yml b/package/endpoint/data_stream/actions/manifest.yml
index 96c9f4fb2..d7fd422da 100644
--- a/package/endpoint/data_stream/actions/manifest.yml
+++ b/package/endpoint/data_stream/actions/manifest.yml
@@ -6,3 +6,5 @@ elasticsearch:
   index_template:
     mappings:
       dynamic: false
+  dynamic_dataset: true
+  dynamic_namespace: true
\ No newline at end of file
diff --git a/package/endpoint/data_stream/alerts/manifest.yml b/package/endpoint/data_stream/alerts/manifest.yml
index 41b10f283..9edc4e729 100644
--- a/package/endpoint/data_stream/alerts/manifest.yml
+++ b/package/endpoint/data_stream/alerts/manifest.yml
@@ -11,3 +11,5 @@ elasticsearch:
             limit: 5000
     mappings:
       dynamic: false
+  dynamic_dataset: true
+  dynamic_namespace: true
\ No newline at end of file
diff --git a/package/endpoint/data_stream/api/manifest.yml b/package/endpoint/data_stream/api/manifest.yml
index cb05f0510..370ad8d86 100644
--- a/package/endpoint/data_stream/api/manifest.yml
+++ b/package/endpoint/data_stream/api/manifest.yml
@@ -5,3 +5,5 @@ elasticsearch:
   index_template:
     mappings:
       dynamic: false
+  dynamic_dataset: true
+  dynamic_namespace: true
\ No newline at end of file
diff --git a/package/endpoint/data_stream/collection/manifest.yml b/package/endpoint/data_stream/collection/manifest.yml
index 515f61cc6..48388891d 100644
--- a/package/endpoint/data_stream/collection/manifest.yml
+++ b/package/endpoint/data_stream/collection/manifest.yml
@@ -7,3 +7,5 @@ elasticsearch:
   index_template:
     mappings:
       dynamic: false
+  dynamic_dataset: true
+  dynamic_namespace: true
\ No newline at end of file
diff --git a/package/endpoint/data_stream/file/manifest.yml b/package/endpoint/data_stream/file/manifest.yml
index bfa9eb489..47491d432 100644
--- a/package/endpoint/data_stream/file/manifest.yml
+++ b/package/endpoint/data_stream/file/manifest.yml
@@ -5,3 +5,5 @@ elasticsearch:
   index_template:
     mappings:
       dynamic: false
+  dynamic_dataset: true
+  dynamic_namespace: true
\ No newline at end of file
diff --git a/package/endpoint/data_stream/heartbeat/manifest.yml b/package/endpoint/data_stream/heartbeat/manifest.yml
index b62bd15dd..55bdafffd 100644
--- a/package/endpoint/data_stream/heartbeat/manifest.yml
+++ b/package/endpoint/data_stream/heartbeat/manifest.yml
@@ -13,3 +13,5 @@ elasticsearch:
             - event.ingested
           order:
             - desc
+  dynamic_dataset: true
+  dynamic_namespace: true
\ No newline at end of file
diff --git a/package/endpoint/data_stream/library/manifest.yml b/package/endpoint/data_stream/library/manifest.yml
index 842197df1..a2f169af6 100644
--- a/package/endpoint/data_stream/library/manifest.yml
+++ b/package/endpoint/data_stream/library/manifest.yml
@@ -5,3 +5,5 @@ elasticsearch:
   index_template:
     mappings:
       dynamic: false
+  dynamic_dataset: true
+  dynamic_namespace: true
\ No newline at end of file
diff --git a/package/endpoint/data_stream/metadata/manifest.yml b/package/endpoint/data_stream/metadata/manifest.yml
index b3ce646f8..52a51fb55 100644
--- a/package/endpoint/data_stream/metadata/manifest.yml
+++ b/package/endpoint/data_stream/metadata/manifest.yml
@@ -13,3 +13,5 @@ elasticsearch:
           order:
             - desc
             - asc
+  dynamic_dataset: true
+  dynamic_namespace: true
\ No newline at end of file
diff --git a/package/endpoint/data_stream/metrics/manifest.yml b/package/endpoint/data_stream/metrics/manifest.yml
index 6e47afb7a..1c0ea83f2 100644
--- a/package/endpoint/data_stream/metrics/manifest.yml
+++ b/package/endpoint/data_stream/metrics/manifest.yml
@@ -4,3 +4,5 @@ elasticsearch:
   index_template:
     mappings:
       dynamic: false
+  dynamic_dataset: true
+  dynamic_namespace: true
\ No newline at end of file
diff --git a/package/endpoint/data_stream/network/manifest.yml b/package/endpoint/data_stream/network/manifest.yml
index 5e28d5f17..8885d4e83 100644
--- a/package/endpoint/data_stream/network/manifest.yml
+++ b/package/endpoint/data_stream/network/manifest.yml
@@ -5,3 +5,5 @@ elasticsearch:
   index_template:
     mappings:
       dynamic: false
+  dynamic_dataset: true
+  dynamic_namespace: true
\ No newline at end of file
diff --git a/package/endpoint/data_stream/policy/manifest.yml b/package/endpoint/data_stream/policy/manifest.yml
index 7e2516c31..01a1f34a2 100644
--- a/package/endpoint/data_stream/policy/manifest.yml
+++ b/package/endpoint/data_stream/policy/manifest.yml
@@ -4,3 +4,5 @@ elasticsearch:
   index_template:
     mappings:
       dynamic: false
+  dynamic_dataset: true
+  dynamic_namespace: true
\ No newline at end of file
diff --git a/package/endpoint/data_stream/process/manifest.yml b/package/endpoint/data_stream/process/manifest.yml
index 26212cd6a..c92f1c96c 100644
--- a/package/endpoint/data_stream/process/manifest.yml
+++ b/package/endpoint/data_stream/process/manifest.yml
@@ -5,3 +5,5 @@ elasticsearch:
   index_template:
     mappings:
       dynamic: false
+  dynamic_dataset: true
+  dynamic_namespace: true
\ No newline at end of file
diff --git a/package/endpoint/data_stream/registry/manifest.yml b/package/endpoint/data_stream/registry/manifest.yml
index 902dd2b3b..4a73572e1 100644
--- a/package/endpoint/data_stream/registry/manifest.yml
+++ b/package/endpoint/data_stream/registry/manifest.yml
@@ -5,3 +5,5 @@ elasticsearch:
   index_template:
     mappings:
       dynamic: false
+  dynamic_dataset: true
+  dynamic_namespace: true
\ No newline at end of file
diff --git a/package/endpoint/data_stream/security/manifest.yml b/package/endpoint/data_stream/security/manifest.yml
index 5b349fe80..eab894c83 100644
--- a/package/endpoint/data_stream/security/manifest.yml
+++ b/package/endpoint/data_stream/security/manifest.yml
@@ -5,3 +5,5 @@ elasticsearch:
   index_template:
     mappings:
       dynamic: false
+  dynamic_dataset: true
+  dynamic_namespace: true
\ No newline at end of file