diff --git a/salt/elasticfleet/files/integrations/grid-nodes_general/elastic-agent-monitor.json b/salt/elasticfleet/files/integrations/grid-nodes_general/elastic-agent-monitor.json
index 344d7b3bc..0be40a3d3 100644
--- a/salt/elasticfleet/files/integrations/grid-nodes_general/elastic-agent-monitor.json
+++ b/salt/elasticfleet/files/integrations/grid-nodes_general/elastic-agent-monitor.json
@@ -21,7 +21,7 @@
             "paths": [
               "/opt/so/log/agents/agent-monitor.log"
             ],
-            "data_stream.dataset": "agent-monitor",
+            "data_stream.dataset": "agentmonitor",
             "pipeline": "elasticagent.monitor",
             "parsers": "",
             "exclude_files": [
diff --git a/salt/elasticsearch/defaults.yaml b/salt/elasticsearch/defaults.yaml
index 9ad9ccd0c..6ed55a936 100644
--- a/salt/elasticsearch/defaults.yaml
+++ b/salt/elasticsearch/defaults.yaml
@@ -1323,7 +1323,7 @@ elasticsearch:
               set_priority:
                 priority: 50
             min_age: 30d
-    so-logs-agent-monitor:
+    so-elastic-agent-monitor:
       index_sorting: false
       index_template:
         composed_of:
@@ -1335,10 +1335,8 @@ elasticsearch:
         data_stream:
           allow_custom_routing: false
           hidden: false
-        ignore_missing_component_templates:
-        - logs-agent-monitor@custom
         index_patterns:
-        - logs-agent-monitor-*
+        - logs-agentmonitor-*
         priority: 501
         template:
           mappings:
@@ -1350,7 +1348,7 @@ elasticsearch:
           settings:
             index:
               lifecycle:
-                name: so-logs-agent-monitor-logs
+                name: so-elastic-agent-monitor-logs
               mapping:
                 total_fields:
                   limit: 5000