diff --git a/elastic/logs/track.json b/elastic/logs/track.json
index f50d8d1d..7be1279e 100644
--- a/elastic/logs/track.json
+++ b/elastic/logs/track.json
@@ -195,18 +195,18 @@
     }
   ],
   "component-templates": [
-    {
-        "name": ".fleet_agent_id_verification-1",
-        "template": "./templates/component/.fleet_agent_id_verification-1.json",
-        "template-path": "component_template"
+    {% if build_flavor != "serverless" %}
+      {
+          "name": ".fleet_agent_id_verification-1",
+          "template": "./templates/component/.fleet_agent_id_verification-1.json",
+          "template-path": "component_template"
 
-    },
-    {% if p_skip_fleet_globals == false %}
-    {
-        "name": ".fleet_globals-1",
-        "template": "./templates/component/.fleet_globals-1.json",
-        "template-path": "component_template"
-    },
+      },
+      {
+          "name": ".fleet_globals-1",
+          "template": "./templates/component/.fleet_globals-1.json",
+          "template-path": "component_template"
+      },
     {% endif %}
     {
         "name": "logs-apache.access@package",