diff --git a/elastic/logs/challenges/esql-ccs-snapshot.json b/elastic/logs/challenges/esql-ccs-snapshot.json
index c8f4f52b..9bb431fe 100644
--- a/elastic/logs/challenges/esql-ccs-snapshot.json
+++ b/elastic/logs/challenges/esql-ccs-snapshot.json
@@ -2,10 +2,15 @@
 {
   "name": "esql-ccs-snapshot",
   "description": "Indexes logs to the local cluster, and runs ESQL queries either locally or across remote clusters via CCS. Data replicated via snapshot/restore.",
+  "parameters": {
+    "generate-data": {{ generate_data | default('true') | tojson }}
+  },
   "schedule": [
-    {% if not p_skip_esql_ccs_remote_clusters %}
+
+    {% if not p_esql_ccs_skip_remote_clusters %}
       {% include "tasks/many-clusters-setup.json" %},
     {% endif %}
+
     {% include "tasks/index-setup.json" %},
     {
       "name": "bulk-index",
@@ -32,24 +37,20 @@
         "request-timeout": 60
       }
     },
-    {% if p_skip_esql_ccs_remote_clusters %}
-      {
-        "name": "check-cluster-health-local",
-        "operation": {
-          "operation-type": "cluster-health",
-          "index": "_all",
-          "request-params": {
-            "wait_for_status": "{{cluster_health | default('green')}}",
-            "wait_for_no_relocating_shards": "true"
-          },
-          "retry-until-success": true
-        }
-      },
-    {% else %}{# if p_skip_esql_ccs_remote_clusters ... #}
-      {# mutate a copy so as not to override in other challenges. shallow copy is ok since we're changing a top-level element.' #}
-        {% set many_clusters_snapshot_repo_settings = p_snapshot_repo_settings.copy() %}
-      {# randomize base path to avoid clashes when running concurrent benchmarks #}
+
+    {# mutate a copy so as not to override in other challenges. shallow copy is ok since we're changing a top-level element.' #}
+      {% set many_clusters_snapshot_repo_settings = p_snapshot_repo_settings.copy() %}
+    {# randomize base path to avoid clashes when running concurrent benchmarks #}
+      {% if 'base_path' not in many_clusters_snapshot_repo_settings %}
         {% set _=many_clusters_snapshot_repo_settings.update({"base_path":"many-clusters-"+((now|int)|string)}) %}
+      {% endif %}
+
+    {
+      "name": "check-cluster-health-on-local-cluster",
+      "operation": "check-cluster-health-on-local-cluster"
+    },
+
+    {% if p_esql_ccs_include_local_snapshot %}
       {
         "name": "register-snapshot-repository-on-local-cluster",
         "operation": {
@@ -61,13 +62,38 @@
           }
         }
       },
+      {
+        "name": "create-snapshot",
+        "operation": {
+          "operation-type": "create-snapshot",
+          "repository": {{ p_snapshot_repo_name | tojson }},
+          "snapshot": {{ p_snapshot_name | tojson }},
+          "wait-for-completion": false,
+          "body": {
+            "indices": {{ p_restore_data_streams | tojson }},
+            "ignore_unavailable": true,
+            "include_global_state": false,
+            "metadata": {{ p_snapshot_metadata | tojson }}
+          },
+          "include-in-reporting": true
+        }
+      },
+      {
+        "name": "wait-for-snapshot",
+        "operation": {
+          "operation-type": "wait-for-snapshot-create",
+          "snapshot": {{ p_snapshot_name | tojson }},
+          "repository": {{ p_snapshot_repo_name | tojson }}
+        }
+      },
+    {% endif %}
+
+    {% if p_esql_ccs_include_local_snapshot_restore %}
       {% set _=many_clusters_snapshot_repo_settings.update({"readonly":true}) %}
       {
-        "name": "register-snapshot-repository-on-remote-clusters",
+        "name": "register-snapshot-repository-on-local-cluster",
         "operation": {
-          "operation-type": "multi-cluster-wrapper",
-          "base-operation-type": "create-snapshot-repository",
-          "ignore-clusters": ["default"],
+          "operation-type": "create-snapshot-repository",
           "repository": {{ p_snapshot_repo_name | tojson }},
           "body": {
             "type": {{ p_snapshot_repo_type | tojson }},
@@ -76,9 +102,9 @@
         }
       },
       {
-        "name": "create-snapshot-{{ p_snapshot_name }}",
+        "name": "recover-snapshot-on-local-cluster",
         "operation": {
-          "operation-type": "create-snapshot",
+          "operation-type": "restore-snapshot",
           "repository": {{ p_snapshot_repo_name | tojson }},
           "snapshot": {{ p_snapshot_name | tojson }},
           "wait-for-completion": false,
@@ -86,21 +112,41 @@
             "indices": {{ p_restore_data_streams | tojson }},
             "ignore_unavailable": true,
             "include_global_state": false,
-            "metadata": {{ p_snapshot_metadata | tojson }}
-          },
-          "include-in-reporting": true
+            "rename_pattern": "(.+)",
+            "rename_replacement": "$1{{ p_snapshot_rename_suffix }}"
+          }
         }
       },
       {
-        "name": "wait-for-snapshot-{{ p_snapshot_name }}",
+        "name": "wait-for-snapshot-recovery-on-local-cluster",
         "operation": {
-          "operation-type": "wait-for-snapshot-create",
-          "snapshot": {{ p_snapshot_name | tojson }},
-          "repository": {{ p_snapshot_repo_name | tojson }}
+          "operation-type": "wait-for-recovery",
+          "index": {{ (p_restore_data_streams~p_snapshot_rename_suffix) | tojson }}
+        }
+      },
+      {
+        "name": "check-cluster-health-on-local-cluster-after-snapshot-restore",
+        "operation": "check-cluster-health-on-local-cluster"
+      },
+    {% endif %}
+
+    {% if not p_esql_ccs_skip_remote_clusters %}
+      {% set _=many_clusters_snapshot_repo_settings.update({"readonly":true}) %}
+      {
+        "name": "register-snapshot-repository-on-remote-clusters",
+        "operation": {
+          "operation-type": "multi-cluster-wrapper",
+          "base-operation-type": "create-snapshot-repository",
+          "ignore-clusters": ["default"],
+          "repository": {{ p_snapshot_repo_name | tojson }},
+          "body": {
+            "type": {{ p_snapshot_repo_type | tojson }},
+            "settings": {{ many_clusters_snapshot_repo_settings | tojson(indent=2)}}
+          }
         }
       },
       {
-        "name": "recover-snapshot-{{ p_snapshot_name }}-on-remote-clusters",
+        "name": "recover-snapshot-on-remote-clusters",
         "operation": {
           "operation-type": "multi-cluster-wrapper",
           "base-operation-type": "restore-snapshot",
@@ -118,25 +164,17 @@
         }
       },
       {
-        "name": "wait-for-snapshot-recovery-{{ p_snapshot_name }}-on-all-clusters",
+        "name": "wait-for-snapshot-recovery-on-remote-clusters",
         "operation": {
           "operation-type": "multi-cluster-wrapper",
           "base-operation-type": "wait-for-recovery",
+          "ignore-clusters": ["default"],
           "index": {{ (p_restore_data_streams~p_snapshot_rename_suffix) | tojson }}
         }
       },
       {
-        "name": "check-cluster-health-all-clusters",
-        "operation": {
-          "operation-type": "multi-cluster-wrapper",
-          "base-operation-type": "cluster-health",
-          "index": "_all",
-          "request-params": {
-            "wait_for_status": "{{wait_for_status | default('green')}}",
-            "wait_for_no_relocating_shards": "true"
-          },
-          "retry-until-success": true
-        }
+        "name": "check-cluster-health-on-remote-clusters",
+        "operation": "check-cluster-health-on-remote-clusters"
       },
       {
           "name": "setup-bi-directional-remote-clusters",
@@ -161,7 +199,44 @@
           }
         }
       },
-    {% endif %}{# if p_skip_esql_ccs_remote_clusters ... #}
-    {% include "tasks/many-clusters-esql-ccs-queries.json" %}
+    {% endif %}{# if not p_esql_ccs_skip_remote_clusters ... #}
+
+    {% include "tasks/many-clusters-esql-ccs-queries.json" %},
+
+    {# the following cluster health checks purposefully without retries #}
+    {
+      "name": "check-cluster-health-on-local-cluster-at-completion",
+      "operation": {
+        "operation-type": "cluster-health",
+        "index": "_all",
+        "request-params": {
+          "wait_for_status": "{{cluster_health | default('green')}}",
+          {% if p_esql_ccs_local_nodes_count > 0 %}
+          "wait_for_nodes": {{ p_esql_ccs_local_nodes_count }},
+          {% endif %}
+          "wait_for_no_relocating_shards": "true"
+        },
+        "retry-until-success": false
+      }
+    }
+    {% if not p_esql_ccs_skip_remote_clusters %},
+      {
+        "name": "check-cluster-health-on-remote-clusters-at-completion",
+        "operation": {
+          "operation-type": "multi-cluster-wrapper",
+          "base-operation-type": "cluster-health",
+          "ignore-clusters": ["default"],
+          "index": "_all",
+          "request-params": {
+            "wait_for_status": "{{wait_for_status | default('green')}}",
+            {% if p_esql_ccs_remote_nodes_count > 0 %}
+            "wait_for_nodes": {{ p_esql_ccs_remote_nodes_count }},
+            {% endif %}
+            "wait_for_no_relocating_shards": "true"
+          },
+          "retry-until-success": false
+        }
+      }
+    {% endif %}
   ]
 }
diff --git a/elastic/logs/operations/esql.json b/elastic/logs/operations/esql.json
index e2a13d9e..6dfdffea 100644
--- a/elastic/logs/operations/esql.json
+++ b/elastic/logs/operations/esql.json
@@ -1,7 +1,7 @@
     {
       "name": "enable_query_cache",
       "include-in-reporting": false,
-      {% if p_skip_esql_ccs_remote_clusters %}
+      {% if p_esql_ccs_skip_remote_clusters %}
         "operation-type": "raw-request",
       {% else %}
         "operation-type": "multi-cluster-wrapper",
@@ -17,7 +17,7 @@
     {
       "name": "disable_query_cache",
       "include-in-reporting": false,
-      {% if p_skip_esql_ccs_remote_clusters %}
+      {% if p_esql_ccs_skip_remote_clusters %}
         "operation-type": "raw-request",
       {% else %}
         "operation-type": "multi-cluster-wrapper",
@@ -33,7 +33,7 @@
     {
       "name": "restore_query_cache_default",
       "include-in-reporting": false,
-      {% if p_skip_esql_ccs_remote_clusters %}
+      {% if p_esql_ccs_skip_remote_clusters %}
         "operation-type": "raw-request",
       {% else %}
         "operation-type": "multi-cluster-wrapper",
@@ -102,6 +102,25 @@
         }
       }
     },
+    {
+      "name": "search_basic_count_group_1_no_minimized_roundtrips",
+      "operation-type": "search",
+      "index": "{{p_esql_target_prefix}}logs-*",
+      "body": {
+        "size": 0,
+        "aggs": {
+          "count": {
+            "terms": {
+              "field": "agent.version",
+              "size": 20
+            }
+          }
+        }
+      },
+      "request-params": {
+        "ccs_minimize_roundtrips": false
+      }
+    },
     {
       "name": "search_basic_count_group_2",
       "operation-type": "search",
@@ -227,4 +246,119 @@
       "name": "esql_from_all_limit_50",
       "operation-type": "esql",
       "query": "FROM {{p_esql_target_prefix}}* | LIMIT 50"
+    },
+    {# ESQL scale testing #}
+    {
+      "name": "esql_from_logs_limit_50",
+      "operation-type": "esql",
+      "query": "FROM {{p_esql_target_prefix}}logs-* | LIMIT 50"
+      {%- if p_esql_ccs_extra_body %},
+      "body": {{ p_esql_ccs_extra_body | tojson }}
+      {%- endif %}
+    },
+    {
+      "name": "esql_avg_doc_size",
+      "operation-type": "esql",
+      "query": "FROM {{p_esql_target_prefix}}logs-* | STATS AVG(rally.doc_size)"
+      {%- if p_esql_ccs_extra_body %},
+      "body": {{ p_esql_ccs_extra_body | tojson }}
+      {%- endif %}
+    },
+    {
+      "name": "esql_avg_compression",
+      "operation-type": "esql",
+      "query": "FROM {{p_esql_target_prefix}}logs-* | EVAL compression = rally.doc_size::DOUBLE / rally.message_size | STATS AVG(compression)"
+      {%- if p_esql_ccs_extra_body %},
+      "body": {{ p_esql_ccs_extra_body | tojson }}
+      {%- endif %}
+    },
+    {
+      "name": "esql_avg_amount_group_by_integer",
+      "operation-type": "esql",
+      "query": "FROM {{p_esql_target_prefix}}logs-* | STATS AVG(rally.message_size) BY b = BUCKET(rally.doc_size, 1000.) | SORT b"
+      {%- if p_esql_ccs_extra_body %},
+      "body": {{ p_esql_ccs_extra_body | tojson }}
+      {%- endif %}
+    },
+    {
+      "name": "esql_avg_amount_group_by_keyword",
+      "operation-type": "esql",
+      "query": "FROM {{p_esql_target_prefix}}logs-* | STATS AVG(rally.message_size) BY cloud.machine.type"
+      {%- if p_esql_ccs_extra_body %},
+      "body": {{ p_esql_ccs_extra_body | tojson }}
+      {%- endif %}
+    },
+    {
+      "name": "esql_count_group_by_keyword",
+      "operation-type": "esql",
+      "query": "FROM {{p_esql_target_prefix}}logs-* | STATS count(*) BY cloud.machine.type"
+      {%- if p_esql_ccs_extra_body %},
+      "body": {{ p_esql_ccs_extra_body | tojson }}
+      {%- endif %}
+    },
+    {
+      "name": "esql_sort_by_ts",
+      "operation-type": "esql",
+      "query": "FROM {{p_esql_target_prefix}}logs-* | SORT @timestamp DESC | KEEP @timestamp, host.name, log.offset | LIMIT 1000"
+      {%- if p_esql_ccs_extra_body %},
+      "body": {{ p_esql_ccs_extra_body | tojson }}
+      {%- endif %}
+    },
+    {
+      "name": "esql_date_histogram_fixed_interval",
+      "operation-type": "esql",
+      "query": "FROM {{p_esql_target_prefix}}logs-* | STATS COUNT(*) BY b=BUCKET(@timestamp, 1 WEEK) | SORT b"
+      {%- if p_esql_ccs_extra_body %},
+      "body": {{ p_esql_ccs_extra_body | tojson }}
+      {%- endif %}
+    },
+    {
+      "name": "esql_date_histogram_fixed_interval_with_metrics",
+      "operation-type": "esql",
+      "query": "FROM {{p_esql_target_prefix}}logs-* | EVAL every10days = DATE_TRUNC(10 DAYS, @timestamp) | STATS min=MIN(log.offset), max=MAX(log.offset), avg=AVG(log.offset) BY every10days | SORT every10days"
+      {%- if p_esql_ccs_extra_body %},
+      "body": {{ p_esql_ccs_extra_body | tojson }}
+      {%- endif %}
+    },
+    {
+      "name": "esql_multi_terms_keyword",
+      "operation-type": "esql",
+      "query": "FROM {{p_esql_target_prefix}}logs-* | STATS c=COUNT(@timestamp) BY cloud.machine.type, cloud.provider, cloud.region"
+      {%- if p_esql_ccs_extra_body %},
+      "body": {{ p_esql_ccs_extra_body | tojson }}
+      {%- endif %}
+    },
+    {
+      "name": "cluster_stats_with_remotes",
+      "operation-type": "raw-request",
+      "path": "/_cluster/stats?include_remotes=true",
+      "method": "GET"
+    },
+    {
+      "name": "check-cluster-health-on-local-cluster",
+      "operation-type": "cluster-health",
+      "index": "_all",
+      "request-params": {
+        "wait_for_status": "{{cluster_health | default('green')}}",
+        {% if p_esql_ccs_local_nodes_count > 0 %}
+        "wait_for_nodes": {{ p_esql_ccs_local_nodes_count }},
+        {% endif %}
+        "wait_for_no_relocating_shards": "true"
+      },
+      "retry-until-success": true
+    },
+    {
+      "name": "check-cluster-health-on-remote-clusters",
+      "operation-type": "multi-cluster-wrapper",
+      "base-operation-type": "cluster-health",
+      "ignore-clusters": ["default"],
+      "index": "_all",
+      "request-params": {
+        "wait_for_status": "{{wait_for_status | default('green')}}",
+        {% if p_esql_ccs_remote_nodes_count > 0 %}
+        "wait_for_nodes": {{ p_esql_ccs_remote_nodes_count }},
+        {% endif %}
+        "wait_for_no_relocating_shards": "true"
+      },
+      "retry-until-success": true
     }
diff --git a/elastic/logs/tasks/many-clusters-esql-ccs-queries.json b/elastic/logs/tasks/many-clusters-esql-ccs-queries.json
index 8e81bbf8..8d009d83 100644
--- a/elastic/logs/tasks/many-clusters-esql-ccs-queries.json
+++ b/elastic/logs/tasks/many-clusters-esql-ccs-queries.json
@@ -1,155 +1,252 @@
-    {
-      "operation": "esql_basic_count_group_0_limit_0",
-      "clients": 1,
-      "warmup-iterations": 10,
-      "iterations": 50,
-      "tags": ["esql", "limit0"]
-    },
-    {
-      "operation": "esql_basic_count_group_1_limit_0",
-      "clients": 1,
-      "warmup-iterations": 10,
-      "iterations": 50,
-      "tags": ["esql", "limit0"]
-    },
-    {
-      "operation": "esql_basic_count_group_2_limit_0",
-      "clients": 1,
-      "warmup-iterations": 10,
-      "iterations": 50,
-      "tags": ["esql", "limit0"]
-    },
-    {
-      "operation": "esql_basic_count_group_3_limit_0",
-      "clients": 1,
-      "warmup-iterations": 10,
-      "iterations": 50,
-      "tags": ["esql", "limit0"]
-    },
-    {
-      "operation": "esql_basic_count_group_4_limit_0",
-      "clients": 1,
-      "warmup-iterations": 10,
-      "iterations": 50,
-      "tags": ["esql", "limit0"]
-    },
-    {
-      "operation": "esql_time_range_and_date_histogram_two_groups_pre_filter_limit_0",
-      "clients": 1,
-      "warmup-iterations": 10,
-      "iterations": 50,
-      "tags": ["esql", "limit0"]
-    },
-    {
-      "operation": "esql_time_range_and_date_histogram_two_groups_post_filter_limit_0",
-      "clients": 1,
-      "warmup-iterations": 10,
-      "iterations": 50,
-      "tags": ["esql", "limit0"]
-    },
-    {
-      "operation": "esql_dissect_duration_and_stats_limit_0",
-      "clients": 1,
-      "warmup-iterations": 10,
-      "iterations": 50,
-      "tags": ["esql", "limit0"]
-    },
-    {
-      "operation": "esql_basic_count_group_0",
-      "clients": 1,
-      "warmup-iterations": 10,
-      "iterations": 50,
-      "tags": ["esql", "count"]
-    },
-    {
-      "operation": "esql_basic_count_group_1",
-      "clients": 1,
-      "warmup-iterations": 10,
-      "iterations": 50,
-      "tags": ["esql", "count"]
-    },
-    {
-      "operation": "esql_basic_count_group_2",
-      "clients": 1,
-      "warmup-iterations": 5,
-      "iterations": 20,
-      "tags": ["esql", "count"]
-    },
-    {
-      "operation": "esql_basic_count_group_3",
-      "clients": 1,
-      "warmup-iterations": 5,
-      "iterations": 10,
-      "tags": ["esql", "count"]
-    },
-    {
-      "operation": "esql_basic_count_group_4",
-      "clients": 1,
-      "warmup-iterations": 5,
-      "iterations": 10,
-      "tags": ["esql", "count"]
-    },
-    {
-      "operation": "esql_time_range_and_date_histogram_two_groups_pre_filter",
-      "clients": 1,
-      "warmup-iterations": 5,
-      "iterations": 20,
-      "tags": ["esql", "date_histogram"]
-    },
-    {
-      "operation": "esql_time_range_and_date_histogram_two_groups_post_filter",
-      "clients": 1,
-      "warmup-iterations": 5,
-      "iterations": 20,
-      "tags": ["esql", "date_histogram"]
-    },
-    {
-      "operation": "esql_dissect_duration_and_stats",
-      "clients": 1,
-      "warmup-iterations": 5,
-      "iterations": 20,
-      "tags": ["esql", "dissect"]
-    }{%- if build_flavor != "serverless" or serverless_operator == true %},
-    {
-      "operation": "disable_query_cache",
-      "tags": ["esql", "settings"]
-    },
-    {
-      "operation": "search_basic_count_group_0",
-      "clients": 1,
-      "warmup-iterations": 10,
-      "iterations": 50,
-      "tags": ["esql", "count", "search"]
-    },
-    {
-      "operation": "search_basic_count_group_1",
-      "clients": 1,
-      "warmup-iterations": 10,
-      "iterations": 50,
-      "tags": ["esql", "count", "search"]
-    },
-    {
-      "operation": "search_basic_count_group_2",
-      "clients": 1,
-      "warmup-iterations": 2,
-      "iterations": 5,
-      "tags": ["esql", "count", "search"]
-    },
-    {
-      "operation": "search_basic_count_group_3",
-      "clients": 1,
-      "warmup-iterations": 1,
-      "iterations": 3,
-      "tags": ["esql", "count", "search"]
-    },
-    {
-      "operation": "search_basic_count_group_4",
-      "clients": 1,
-      "warmup-iterations": 1,
-      "iterations": 3,
-      "tags": ["esql", "count", "search"]
-    },
-    {
-      "operation": "restore_query_cache_default",
-      "tags": ["esql", "settings"]
-    }{%- endif %}
+    {% if not p_esql_ccs_scaling_queries %}
+      {
+        "operation": "esql_basic_count_group_0_limit_0",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "limit0"]
+      },
+      {
+        "operation": "esql_basic_count_group_1_limit_0",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "limit0"]
+      },
+      {
+        "operation": "esql_basic_count_group_2_limit_0",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "limit0"]
+      },
+      {
+        "operation": "esql_basic_count_group_3_limit_0",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "limit0"]
+      },
+      {
+        "operation": "esql_basic_count_group_4_limit_0",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "limit0"]
+      },
+      {
+        "operation": "esql_time_range_and_date_histogram_two_groups_pre_filter_limit_0",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "limit0"]
+      },
+      {
+        "operation": "esql_time_range_and_date_histogram_two_groups_post_filter_limit_0",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "limit0"]
+      },
+      {
+        "operation": "esql_dissect_duration_and_stats_limit_0",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "limit0"]
+      },
+      {
+        "operation": "esql_basic_count_group_0",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "count"]
+      },
+      {
+        "operation": "esql_basic_count_group_1",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "count"]
+      },
+      {
+        "operation": "esql_basic_count_group_2",
+        "clients": 1,
+        "warmup-iterations": 5,
+        "iterations": 20,
+        "tags": ["esql", "count"]
+      },
+      {
+        "operation": "esql_basic_count_group_3",
+        "clients": 1,
+        "warmup-iterations": 5,
+        "iterations": 10,
+        "tags": ["esql", "count"]
+      },
+      {
+        "operation": "esql_basic_count_group_4",
+        "clients": 1,
+        "warmup-iterations": 5,
+        "iterations": 10,
+        "tags": ["esql", "count"]
+      },
+      {
+        "operation": "esql_time_range_and_date_histogram_two_groups_pre_filter",
+        "clients": 1,
+        "warmup-iterations": 5,
+        "iterations": 20,
+        "tags": ["esql", "date_histogram"]
+      },
+      {
+        "operation": "esql_time_range_and_date_histogram_two_groups_post_filter",
+        "clients": 1,
+        "warmup-iterations": 5,
+        "iterations": 20,
+        "tags": ["esql", "date_histogram"]
+      },
+      {
+        "operation": "esql_dissect_duration_and_stats",
+        "clients": 1,
+        "warmup-iterations": 5,
+        "iterations": 20,
+        "tags": ["esql", "dissect"]
+      }
+      {%- if build_flavor != "serverless" or serverless_operator == true %},
+        {
+          "operation": "disable_query_cache",
+          "tags": ["esql", "settings"]
+        },
+        {
+          "operation": "search_basic_count_group_0",
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50,
+          "tags": ["esql", "count", "search"]
+        },
+        {
+          "operation": "search_basic_count_group_1",
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50,
+          "tags": ["esql", "count", "search"]
+        },
+        {
+          "operation": "search_basic_count_group_2",
+          "clients": 1,
+          "warmup-iterations": 2,
+          "iterations": 5,
+          "tags": ["esql", "count", "search"]
+        },
+        {
+          "operation": "search_basic_count_group_3",
+          "clients": 1,
+          "warmup-iterations": 1,
+          "iterations": 3,
+          "tags": ["esql", "count", "search"]
+        },
+        {
+          "operation": "search_basic_count_group_4",
+          "clients": 1,
+          "warmup-iterations": 1,
+          "iterations": 3,
+          "tags": ["esql", "count", "search"]
+        },
+        {
+          "operation": "restore_query_cache_default",
+          "tags": ["esql", "settings"]
+        }
+      {%- endif %}{# if build_flavor != "serverless" or serverless_operator == true #}
+    {% else %}{# if not p_esql_ccs_scaling_queries #}
+      {
+        "operation": "esql_from_logs_limit_50",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "limit50"]
+      },
+      {
+        "operation": "esql_avg_doc_size",
+        "clients": 1,
+        "warmup-iterations": 1,
+        "iterations": 1,
+        "tags": ["esql", "avg"]
+      },
+      {
+        "operation": "esql_avg_compression",
+        "clients": 1,
+        "warmup-iterations": 1,
+        "iterations": 1,
+        "tags": ["esql", "avg"]
+      },
+      {
+        "operation": "esql_avg_amount_group_by_integer",
+        "clients": 1,
+        "warmup-iterations": 1,
+        "iterations": 1,
+        "tags": ["esql", "avg", "groupby"]
+      },
+      {
+        "operation": "esql_avg_amount_group_by_keyword",
+        "clients": 1,
+        "warmup-iterations": 1,
+        "iterations": 1,
+        "tags": ["esql", "avg", "groupby"]
+      },
+      {
+        "operation": "esql_count_group_by_keyword",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "count", "groupby"]
+      },
+      {
+        "operation": "esql_sort_by_ts",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "sort"]
+      },
+      {
+        "operation": "esql_date_histogram_fixed_interval",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "histogram"]
+      },
+      {
+        "operation": "esql_date_histogram_fixed_interval_with_metrics",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "histogram"]
+      },
+      {
+        "operation": "esql_multi_terms_keyword",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "histogram"]
+      },
+      {# CCS telemetry #}
+      {
+        "operation": "search_basic_count_group_1",
+        "clients": 1,
+        "warmup-iterations": 10,
+        "iterations": 50,
+        "tags": ["esql", "count", "search"]
+      },
+      {
+        "operation": "search_basic_count_group_1_no_minimized_roundtrips",
+        "clients": 1,
+        "warmup-iterations": 1,
+        "iterations": 1,
+        "tags": ["esql", "count", "search"]
+      },
+      {
+        "operation": "cluster_stats_with_remotes",
+        "clients": 1,
+        "warmup-iterations": 1,
+        "iterations": 1,
+        "tags": ["esql", "stats"]
+      }
+    {% endif %}{# if notp_esql_ccs_scaling_queries #}
diff --git a/elastic/logs/track.json b/elastic/logs/track.json
index 22884551..ee2a5ef9 100644
--- a/elastic/logs/track.json
+++ b/elastic/logs/track.json
@@ -29,12 +29,20 @@
 
 {% set p_recovery_max_bytes_per_sec = (recovery_max_bytes_per_sec | default(-1)) %}
 {% set p_node_concurrent_recoveries = (node_concurrent_recoveries | default(2)) %}
-{% set p_skip_esql_ccs_remote_clusters = (skip_esql_ccs_remote_clusters | default(true)) %}
-{% if p_skip_esql_ccs_remote_clusters %}
+
+{% set p_esql_ccs_skip_remote_clusters = (esql_ccs_skip_remote_clusters | default(true)) %}
+{% if p_esql_ccs_skip_remote_clusters %}
   {% set p_esql_target_prefix = "" %}
 {% else %}
   {% set p_esql_target_prefix = "remote*:" %}
 {% endif %}
+{% set p_esql_ccs_include_local_snapshot = (esql_ccs_include_local_snapshot | default(not p_esql_ccs_skip_remote_clusters)) %}
+{% set p_esql_ccs_include_local_snapshot_restore = (esql_ccs_include_local_snapshot_restore | default(false)) %}
+{% set p_esql_ccs_scaling_queries = (esql_ccs_scaling_queries | default(false)) %}
+{% set p_esql_ccs_extra_body = (esql_ccs_extra_body | default("")) %}
+{% set p_esql_ccs_local_nodes_count = (esql_ccs_local_nodes_count | default(0)) %}
+{% set p_esql_ccs_remote_nodes_count = (esql_ccs_remote_nodes_count | default(0)) %}
+
 {% set p_snapshot_repo_name = (snapshot_repo_name | default("logging")) %}
 {% set p_snapshot_repo_type = (snapshot_repo_type | default("s3")) %}
 {% set p_snapshot_repo_settings = (snapshot_repo_settings | default({