diff --git a/elastic/security/templates/composable/.logs-endpoint.action.responses.json b/elastic/security/templates/composable/.logs-endpoint.action.responses.json
index f1c23d48d..00601f9d0 100644
--- a/elastic/security/templates/composable/.logs-endpoint.action.responses.json
+++ b/elastic/security/templates/composable/.logs-endpoint.action.responses.json
@@ -21,6 +21,9 @@
       }
     },
     "composed_of": [
+      "logs@mappings",
+      "logs@settings",
+      "ecs@mappings",
       ".logs-endpoint.action.responses@package",
       ".logs-endpoint.action.responses@custom",
       ".fleet_globals-1",
diff --git a/elastic/security/templates/composable/.logs-endpoint.actions.json b/elastic/security/templates/composable/.logs-endpoint.actions.json
index da50aa226..820477c11 100644
--- a/elastic/security/templates/composable/.logs-endpoint.actions.json
+++ b/elastic/security/templates/composable/.logs-endpoint.actions.json
@@ -21,6 +21,9 @@
       }
     },
     "composed_of": [
+      "logs@mappings",
+      "logs@settings",
+      "ecs@mappings",
       ".logs-endpoint.actions@package",
       ".logs-endpoint.actions@custom",
       ".fleet_globals-1",
diff --git a/elastic/security/templates/composable/.logs-endpoint.diagnostic.collection.json b/elastic/security/templates/composable/.logs-endpoint.diagnostic.collection.json
index 1446d3219..80da55a69 100644
--- a/elastic/security/templates/composable/.logs-endpoint.diagnostic.collection.json
+++ b/elastic/security/templates/composable/.logs-endpoint.diagnostic.collection.json
@@ -21,6 +21,9 @@
       }
     },
     "composed_of": [
+      "logs@mappings",
+      "logs@settings",
+      "ecs@mappings",
       ".logs-endpoint.diagnostic.collection@package",
       ".logs-endpoint.diagnostic.collection@custom",
       ".fleet_globals-1",
diff --git a/elastic/security/templates/composable/logs-endpoint.alerts.json b/elastic/security/templates/composable/logs-endpoint.alerts.json
index 111e5ac5d..19576289d 100644
--- a/elastic/security/templates/composable/logs-endpoint.alerts.json
+++ b/elastic/security/templates/composable/logs-endpoint.alerts.json
@@ -21,6 +21,9 @@
       }
     },
     "composed_of": [
+      "logs@mappings",
+      "logs@settings",
+      "ecs@mappings",
       "logs-endpoint.alerts@package",
       "logs-endpoint.alerts@custom",
       ".fleet_globals-1",
diff --git a/elastic/security/templates/composable/logs-endpoint.events.file.json b/elastic/security/templates/composable/logs-endpoint.events.file.json
index a2cc67abf..6af4b0b6a 100644
--- a/elastic/security/templates/composable/logs-endpoint.events.file.json
+++ b/elastic/security/templates/composable/logs-endpoint.events.file.json
@@ -21,6 +21,9 @@
       }
     },
     "composed_of": [
+      "logs@mappings",
+      "logs@settings",
+      "ecs@mappings",
       "logs-endpoint.events.file@package",
       "logs-endpoint.events.file@custom",
       ".fleet_globals-1",
diff --git a/elastic/security/templates/composable/logs-endpoint.events.library.json b/elastic/security/templates/composable/logs-endpoint.events.library.json
index 729e0b179..89d6b4123 100644
--- a/elastic/security/templates/composable/logs-endpoint.events.library.json
+++ b/elastic/security/templates/composable/logs-endpoint.events.library.json
@@ -21,6 +21,9 @@
       }
     },
     "composed_of": [
+      "logs@mappings",
+      "logs@settings",
+      "ecs@mappings",
       "logs-endpoint.events.library@package",
       "logs-endpoint.events.library@custom",
       ".fleet_globals-1",
diff --git a/elastic/security/templates/composable/logs-endpoint.events.network.json b/elastic/security/templates/composable/logs-endpoint.events.network.json
index 440320817..05a602933 100644
--- a/elastic/security/templates/composable/logs-endpoint.events.network.json
+++ b/elastic/security/templates/composable/logs-endpoint.events.network.json
@@ -21,6 +21,9 @@
       }
     },
     "composed_of": [
+      "logs@mappings",
+      "logs@settings",
+      "ecs@mappings",
       "logs-endpoint.events.network@package",
       "logs-endpoint.events.network@custom",
       ".fleet_globals-1",
diff --git a/elastic/security/templates/composable/logs-endpoint.events.process.json b/elastic/security/templates/composable/logs-endpoint.events.process.json
index 07acf26b4..3a08baa06 100644
--- a/elastic/security/templates/composable/logs-endpoint.events.process.json
+++ b/elastic/security/templates/composable/logs-endpoint.events.process.json
@@ -21,6 +21,9 @@
       }
     },
     "composed_of": [
+      "logs@mappings",
+      "logs@settings",
+      "ecs@mappings",
       "logs-endpoint.events.process@package",
       "logs-endpoint.events.process@custom",
       ".fleet_globals-1",
diff --git a/elastic/security/templates/composable/logs-endpoint.events.registry.json b/elastic/security/templates/composable/logs-endpoint.events.registry.json
index 30ba6c7a8..cfeec3962 100644
--- a/elastic/security/templates/composable/logs-endpoint.events.registry.json
+++ b/elastic/security/templates/composable/logs-endpoint.events.registry.json
@@ -21,6 +21,9 @@
       }
     },
     "composed_of": [
+      "logs@mappings",
+      "logs@settings",
+      "ecs@mappings",
       "logs-endpoint.events.registry@package",
       "logs-endpoint.events.registry@custom",
       ".fleet_globals-1",
diff --git a/elastic/security/templates/composable/logs-endpoint.events.security.json b/elastic/security/templates/composable/logs-endpoint.events.security.json
index dca3688d7..754019000 100644
--- a/elastic/security/templates/composable/logs-endpoint.events.security.json
+++ b/elastic/security/templates/composable/logs-endpoint.events.security.json
@@ -21,6 +21,9 @@
       }
     },
     "composed_of": [
+      "logs@mappings",
+      "logs@settings",
+      "ecs@mappings",
       "logs-endpoint.events.security@package",
       "logs-endpoint.events.security@custom",
       ".fleet_globals-1",