diff --git a/salt/elasticfleet/defaults.yaml b/salt/elasticfleet/defaults.yaml
index 55e70113f..979e795f7 100644
--- a/salt/elasticfleet/defaults.yaml
+++ b/salt/elasticfleet/defaults.yaml
@@ -41,6 +41,7 @@ elasticfleet:
     - fleet_server
     - fim
     - fortinet
+    - fortinet_fortigate
     - gcp
     - github
     - google_workspace
diff --git a/salt/elasticsearch/defaults.yaml b/salt/elasticsearch/defaults.yaml
index 33362825f..cc2f5e1cd 100644
--- a/salt/elasticsearch/defaults.yaml
+++ b/salt/elasticsearch/defaults.yaml
@@ -970,18 +970,18 @@ elasticsearch:
         data_stream:
           hidden: false
           allow_custom_routing: false
-    so-logs-fortinet_x_fortigate:
+    so-logs-fortinet_fortigate_x_log:
       index_sorting: False
       index_template:
         index_patterns:
-          - "logs-fortinet.fortigate-*"
+          - "logs-fortinet_fortigate.log-*"
         template:
           settings:
             index:
               number_of_replicas: 0
         composed_of:
-          - "logs-fortinet.fortigate@package"
-          - "logs-fortinet.fortigate@custom"
+          - "logs-fortinet_fortigate.log@package"
+          - "logs-fortinet_fortigate.log@custom"
           - "so-fleet_globals-1"
           - "so-fleet_agent_id_verification-1"
         priority: 501