diff --git a/joins/README.md b/joins/README.md
new file mode 100644
index 000000000..c035f59e7
--- /dev/null
+++ b/joins/README.md
@@ -0,0 +1,52 @@
+## JOINS track
+
+This track contains an artificial dataset intended to test JOIN operations with different key cardinalities.
+
+The dataset can be generated using the scripts in the `_tools` directory.
+
+### Example Documents
+
+Main index: 
+
+```json
+{
+  "id": 56,
+  "@timestamp": 946728056,
+  "key_1000": "56",
+  "key_100000": "56",
+  "key_200000": "56",
+  "key_500000": "56",
+  "key_1000000": "56",
+  "key_5000000": "56",
+  "key_100000000": "56",
+  "field_0": "text with value 0_56",
+  "field_1": "text with value 1_56",
+  "field_2": "text with value 2_56",
+  ...
+  "field_99": "text with value 99_56"
+}
+```
+
+The cardinality of the keys is the same as the key name, eg. `key_1000` will have 1000 different values in the dataset,
+from `0` to `999` (unless the dataset is not big enough to contain all the keys of a given cardinality, 
+eg. with a dataset of 1000 documents, `key_100000000` will contain only 1000 distinct keys, one per document).
+The IDs and the timestamps are sequential.
+
+### Parameters
+
+This track allows to overwrite the following parameters using `--track-params`:
+
+* `bulk_size` (default: 10000)
+* `bulk_indexing_clients` (default: 8): Number of clients that issue bulk indexing requests.
+* `ingest_percentage` (default: 100): A number between 0 and 100 that defines how much of the document corpus should be ingested. It will be applied to the main index and to the large join indexes (ie. not to join indexes with up to 500K documents)
+* `number_of_replicas` (default: 1): This only applies to the main index (not to lookup indexes)
+* `number_of_shards` (default: 5): This only applies to the main index (not to lookup indexes)
+* `source_mode` (default: stored): Should the `_source` be `stored` to disk exactly as sent (the default), thrown away (`disabled`), or reconstructed on the fly (`synthetic`)
+* `index_settings`: A list of index settings. Index settings defined elsewhere need to be overridden explicitly.
+* `cluster_health` (default: "green"): The minimum required cluster health.
+* `include_non_serverless_index_settings` (default: true for non-serverless clusters, false for serverless clusters): Whether to include non-serverless index settings.
+
+
+### License
+
+According to the [Open Data Law](https://opendata.cityofnewyork.us/open-data-law/) this data is available as public domain.
diff --git a/joins/_tools/README.md b/joins/_tools/README.md
new file mode 100644
index 000000000..df61cfb67
--- /dev/null
+++ b/joins/_tools/README.md
@@ -0,0 +1,89 @@
+## About JOINS datasets
+
+
+### Contents 
+
+This directory contains two scripts
+
+- joins_main_idx.sh - generates the main index, ie. the one that is intended to be used in the FROM clause of the query.
+- lookup_idx.sh - generates lookup (join) indexes, ie. those that are intended to be used in the JOIN command.
+
+
+### Generating the main index
+
+`joins_main_idx.sh` generates JSON documents with the following fields:
+
+- `id`: numeric (incremental)
+- `@timestamp`: numeric, with value id + 946728000 
+- `key_1000`: string, with value id%1000, intended to be a foreign key to a lookup index
+- `key_100000`: string, with value id%100000, intended to be a foreign key to a lookup index
+- `key_200000`: string, with value id%200000, intended to be a foreign key to a lookup index
+- `key_500000`: string, with value id%500000, intended to be a foreign key to a lookup index
+- `key_1000000`: string, with value id%1000000, intended to be a foreign key to a lookup index
+- `key_5000000`: string, with value id%5000000, intended to be a foreign key to a lookup index
+- `key_100000000`: string, with value id%100000000, intended to be a foreign key to a lookup index
+- 100 additional text fields (`field_0` to `field_99`)
+
+By default it produces 1000 documents (one per row), but the number can be changed passing a command line argument.
+
+#### Example usage
+
+Generate a file with 50.000 documents and bzip it: 
+
+```shell
+./joins_main_idx.sh 50000 | bzip2 -c > join_base_idx.json.bz2
+```
+
+
+### Generating the lookup indexes
+
+`lookup_idx.sh` produces a lookup index. 
+
+It accepts three parameters as input:
+
+- cardinality (default 1000): the number of keys to be generated 
+- fields (default 10): the number of additional fields per document
+- repetitions (default 1): the number of repetitions per key
+
+The result will be a file with the following fields:
+
+- `key_<cardinaltity>`: a text containing the lookup key (practically, it's just a sequential number). 
+Since the default cardinality is 1000, the name of this field will be `key_1000` by default. 
+Passing a different cardinality as input will also result in a different field name.
+- `M` additional fields (`M` is defined by the `fields` input param), called `lookup_keyword_0`, `lookup_keyword_1`...`lookup_keyword_M-1`, 
+containing the following string:  `val <id> rep <repetition>`; the id is the same as the value of the key, the repetition is the value of the repetition (exmaple below) 
+
+#### Example usage
+
+
+Generate a lookup dataset with 20.000 keys, repeated 3 times each (ie. 60.000 documents in total), with 5 additional text fields.
+Then shuffle the rows and bzip the result.
+
+```shell
+./lookup_idx.sh 20000 5 3 | shuf | bzip2 - c > my_lookup_idx.json.bz2
+```
+
+The generated file will be like:
+
+```json
+...
+{"key_20000": "15", "field_0": "val 15 rep 0",  ... "field_4": "val 15 rep 0"}
+...
+```
+
+
+
+
+## The default dataset
+
+The dataset for this benchmark was generated with the following:
+
+```shell
+./lookup_idx.sh 1000 10 1 | shuf | bzip2 -c > lookup_idx_1000_f10.json.bz2
+./lookup_idx.sh 100000 10 1 | shuf | bzip2 -c > lookup_idx_100000_f10.json.bz2
+./lookup_idx.sh 200000 10 1 | shuf | bzip2 -c > lookup_idx_200000_f10.json.bz2
+./lookup_idx.sh 500000 10 1 | shuf | bzip2 -c > lookup_idx_500000_f10.json.bz2
+./lookup_idx.sh 1000000 10 1 | shuf | bzip2 -c > lookup_idx_1000000_f10.json.bz2
+./lookup_idx.sh 5000000 10 1 | shuf | bzip2 -c > lookup_idx_5000000_f10.json.bz2
+./joins_main_idx.sh 10000000 | bzip2 -c > join_base_idx-10M.json.bz2
+```
\ No newline at end of file
diff --git a/joins/_tools/joins_main_idx.sh b/joins/_tools/joins_main_idx.sh
new file mode 100755
index 000000000..8dda86fb3
--- /dev/null
+++ b/joins/_tools/joins_main_idx.sh
@@ -0,0 +1,62 @@
+#!/bin/zsh
+
+# generate the corpus of the main index
+# with the following fields:
+# id: sequential
+# @timestamp: sequential, starting Jan 1st 2000
+# key_1_000: a keyword field with cardinality 1.000
+# key_100_000: a keyword field with cardinality 100.000
+# key_200_000: a keyword field with cardinality 200.000
+# key_500_000: a keyword field with cardinality 500.000
+# key_1_000_000: a keyword field with cardinality 1.000.000
+# key_5_000_000: a keyword field with cardinality 5.000.000
+# key_100_000_000: a keyword field with cardinality 100.000.000
+# field_1..100: 100 text fields
+#
+#
+# By default the script produces 1000 documents with 100 additional keyword fields, but this default is overridden passing two command line arguments,
+# eg.
+#
+# ./joins_main_idx.sh 100000 3
+#
+# produces 100.000 documents with 3 additional fields each
+
+
+
+if [ "$#" -eq 0 ]; then
+    ndocs=1000
+    fields=100
+elif [ "$#" -eq 2 ]; then
+    ndocs=$1
+    fields=$2
+else
+  echo "This script accepts zero or two arguments: number of docs, number of additional fields"
+  echo "eg."
+  echo
+  echo "./joins_main_idx.sh 100 20"
+  echo
+  echo "will produce 100 documents, each document with 20 additional keyword fields"
+  echo
+  echo "With no arguments:"
+  echo
+  echo "./joins_main_idx.sh"
+  echo
+  echo "will produce 1000 documents, each document with 100 additional keyword fields"
+fi
+
+for ((id = 0; id<ndocs; id++)); do
+  echo -n '{'
+  echo -n '"id": '$id''
+  echo -n ', "@timestamp": '$((id+946728000))
+  echo -n ', "key_1000": "'$((id%1000))'"'
+  echo -n ', "key_100000": "'$((id%100000))'"'
+  echo -n ', "key_200000": "'$((id%200000))'"'
+  echo -n ', "key_500000": "'$((id%500000))'"'
+  echo -n ', "key_1000000": "'$((id%1000000))'"'
+  echo -n ', "key_5000000": "'$((id%5000000))'"'
+  echo -n ', "key_100000000": "'$((id%100000000))'"'
+  for ((i = 0; i<fields; i++)); do
+    echo -n ', "field_'$i'": "value '$i'_'$id'"'
+  done
+  echo '}'
+done;
diff --git a/joins/_tools/lookup_idx.sh b/joins/_tools/lookup_idx.sh
new file mode 100755
index 000000000..5567fc376
--- /dev/null
+++ b/joins/_tools/lookup_idx.sh
@@ -0,0 +1,52 @@
+#!/bin/zsh
+
+# generate the corpus of the lookup index
+# with the following fields:
+# key_<cardinality>: a keyword field with cardinality <cardinality>
+# lookup_keyword_1..n: n keyword fields
+#
+# By default the script produces 1000 documents with keys 1...000, 10 keyword fields per doc
+#
+# these defaults can be overridden passing the following command line arguments:
+# - cardinality:
+# - n of fields
+# - n of repetitions
+#
+# The final number of documents will be cardinality X n of repetitions
+#
+# eg.
+#
+# ./lookup_idx.sh 1000 20 3
+#
+# produces 3000 documents, each key will be repeated three times, each document will have 20 keyword fields
+
+
+
+
+if [ "$#" -eq 0 ]; then
+    cardinality=1000
+    fields=10
+    repetitions=1
+elif [ "$#" -eq 3 ]; then
+    cardinality=$1
+    fields=$2
+    repetitions=$3
+else
+  echo "This script accepts zero or three arguments: cardinality, number of fields and number of repetitions"
+  echo "eg."
+  echo
+  echo "./lookup_idx.sh 100 20 3"
+  echo
+  echo "will produce 300 documents, 100 keys (repeated three times), each document with 20 keyword fields"
+fi
+
+for ((id = 0; id<cardinality; id++)); do
+  for ((repetition = 0; repetition<repetitions; repetition++)); do
+    echo -n '{'
+    echo -n '"key_'$cardinality'": "'$id'"'
+    for ((i = 0; i<fields; i++)); do
+      echo -n ', "lookup_keyword_'$i'": "val '$id' rep '$repetition'"'
+    done
+    echo '}'
+  done
+done;
diff --git a/joins/challenges/default.json b/joins/challenges/default.json
new file mode 100644
index 000000000..d4ce4f0da
--- /dev/null
+++ b/joins/challenges/default.json
@@ -0,0 +1,341 @@
+    {
+      "name": "esql",
+      "description": "Performance benchmarks for internal R&D on query languages. This is work in progress",
+      "default": false,
+      "schedule": [
+        {
+          "operation": "delete-index",
+          "tags": ["setup"]
+        },
+        {
+          "operation": {
+            "operation-type": "create-index",
+            "settings": {%- if index_settings is defined %} {{index_settings | tojson}} {%- else %} {
+              {# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
+                {% if p_include_non_serverless_index_settings %}
+              "index.translog.flush_threshold_size": "4g",
+                {% endif %}
+              {%- endif -%}{# non-serverless-index-settings-marker-end #}
+              "index.codec": "best_compression",
+              "index.refresh_interval": "30s"
+            }{%- endif %}
+          },
+          "tags": ["setup"]
+        },
+
+        {
+          "name": "check-cluster-health",
+          "operation": {
+            "operation-type": "cluster-health",
+            "index": "join_base_idx",
+            "request-params": {
+              "wait_for_status": "{{cluster_health | default('green')}}",
+              "wait_for_no_relocating_shards": "true"
+            },
+            "retry-until-success": true
+          },
+          "tags": ["setup"]
+        },
+
+        {
+          "operation": "index-base",
+          "clients": {{bulk_indexing_clients | default(8)}},
+          "tags": ["setup"]
+        },
+        {
+          "operation": "index-small-lookup-indices",
+          "clients": {{bulk_indexing_clients | default(8)}},
+          "tags": ["setup"]
+        },
+        {
+          "operation": "index-lookup-1m",
+          "clients": {{bulk_indexing_clients | default(8)}},
+          "tags": ["setup"]
+        },
+        {
+          "operation": "index-lookup-5m",
+          "clients": {{bulk_indexing_clients | default(8)}},
+          "tags": ["setup"]
+        },
+        {
+          "operation": "index-lookup-100m",
+          "clients": {{bulk_indexing_clients | default(8)}},
+          "tags": ["setup"]
+        },
+        {
+          "name": "refresh-after-index",
+          "operation": "refresh",
+          "tags": ["setup"]
+        },
+
+
+        {
+          "operation": "esql_lookup_join_1k_keys_limit1",
+          "tags": ["lookup", "join", "limit1"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_1k_keys_limit1000",
+          "tags": ["lookup", "join", "limit1000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_1k_keys_limit10000",
+          "tags": ["lookup", "join", "limit10000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_1k_keys_where_limit1000",
+          "tags": ["lookup", "join", "limit1000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_1k_keys_where_no_match",
+          "tags": ["lookup", "join"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+
+
+        {
+          "operation": "esql_lookup_join_100k_keys_limit1",
+          "tags": ["lookup", "join", "limit1"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_100k_keys_limit1000",
+          "tags": ["lookup", "join", "limit1000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_100k_keys_limit10000",
+          "tags": ["lookup", "join", "limit10000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_100k_keys_where_limit1000",
+          "tags": ["lookup", "join", "limit1000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {#
+          "operation": "esql_lookup_join_100k_keys_where_no_match",
+          "tags": ["lookup", "join"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        #}
+
+
+        {
+          "operation": "esql_lookup_join_200k_keys_limit1",
+          "tags": ["lookup", "join", "limit1"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_200k_keys_limit1000",
+          "tags": ["lookup", "join", "limit1000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_200k_keys_limit10000",
+          "tags": ["lookup", "join", "limit10000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_200k_keys_where_limit1000",
+          "tags": ["lookup", "join", "limit1000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {#
+          "operation": "esql_lookup_join_200k_keys_where_no_match",
+          "tags": ["lookup", "join"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        #}
+
+
+        {
+          "operation": "esql_lookup_join_500k_keys_limit1",
+          "tags": ["lookup", "join", "limit1"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_500k_keys_limit1000",
+          "tags": ["lookup", "join", "limit1000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_500k_keys_limit10000",
+          "tags": ["lookup", "join", "limit10000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_500k_keys_where_limit1000",
+          "tags": ["lookup", "join", "limit1000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {#
+          "operation": "esql_lookup_join_500k_keys_where_no_match",
+          "tags": ["lookup", "join"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        #}
+
+
+        {
+          "operation": "esql_lookup_join_1M_keys_limit1",
+          "tags": ["lookup", "join", "limit1"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_1M_keys_limit1000",
+          "tags": ["lookup", "join", "limit1000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_1M_keys_limit10000",
+          "tags": ["lookup", "join", "limit10000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_1M_keys_where_limit1000",
+          "tags": ["lookup", "join", "limit1000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {#
+          "operation": "esql_lookup_join_1M_keys_where_no_match",
+          "tags": ["lookup", "join"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        #}
+
+
+        {
+          "operation": "esql_lookup_join_5M_keys_limit1",
+          "tags": ["lookup", "join", "limit1"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_5M_keys_limit1000",
+          "tags": ["lookup", "join", "limit1000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_5M_keys_limit10000",
+          "tags": ["lookup", "join", "limit10000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_5M_keys_where_limit1000",
+          "tags": ["lookup", "join", "limit1000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {#
+          "operation": "esql_lookup_join_5M_keys_where_no_match",
+          "tags": ["lookup", "join"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        #}
+
+
+        {
+          "operation": "esql_lookup_join_100M_keys_limit1",
+          "tags": ["lookup", "join", "limit1"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_100M_keys_limit1000",
+          "tags": ["lookup", "join", "limit1000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_100M_keys_limit10000",
+          "tags": ["lookup", "join", "limit10000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {
+          "operation": "esql_lookup_join_100M_keys_where_limit1000",
+          "tags": ["lookup", "join", "limit1000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        },
+        {#
+          "operation": "esql_lookup_join_100M_keys_where_no_match",
+          "tags": ["lookup", "join"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        #}
+
+
+        {
+          "operation": "esql_lookup_join_1k_100k_200k_500k",
+          "tags": ["lookup", "join", "limit1000"],
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50
+        }
+
+
+      ]
+    }
diff --git a/joins/index-join_base_idx.json b/joins/index-join_base_idx.json
new file mode 100644
index 000000000..409ee90bb
--- /dev/null
+++ b/joins/index-join_base_idx.json
@@ -0,0 +1,47 @@
+{% set p_include_non_serverless_index_settings = (include_non_serverless_index_settings | default(build_flavor != "serverless")) %}
+
+{
+  "settings": {
+    {# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
+      {% if p_include_non_serverless_index_settings %}
+        "index.number_of_shards": {{number_of_shards | default(5)}},
+        "index.number_of_replicas": {{number_of_replicas | default(0)}},
+      {% endif %}
+        "index.requests.cache.enable": false
+    {%- endif -%}{# non-serverless-index-settings-marker-end #}
+  },
+  "mappings": {
+    "_source": {
+      "mode": {{ source_mode | default("stored") | tojson }}
+    },
+    "properties": {
+      "id": {
+        "type": "long"
+      },
+      "@timestamp": {
+        "type": "date"
+      },
+      "key_1000": {
+        "type": "keyword"
+      },
+      "key_100000": {
+        "type": "keyword"
+      },
+      "key_200000": {
+        "type": "keyword"
+      },
+      "key_500000": {
+        "type": "keyword"
+      },
+      "key_1000000": {
+        "type": "keyword"
+      },
+      "key_5000000": {
+        "type": "keyword"
+      },
+      "key_100000000": {
+        "type": "keyword"
+      }
+    }
+  }
+}
diff --git a/joins/index-lookup_idx_100000000_f10.json b/joins/index-lookup_idx_100000000_f10.json
new file mode 100644
index 000000000..89a610539
--- /dev/null
+++ b/joins/index-lookup_idx_100000000_f10.json
@@ -0,0 +1,20 @@
+{% set p_include_non_serverless_index_settings = (include_non_serverless_index_settings | default(build_flavor != "serverless")) %}
+
+{
+  "settings": {
+        "index.mode": "lookup"
+    {# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
+    , "index.requests.cache.enable": false
+    {%- endif -%}{# non-serverless-index-settings-marker-end #}
+  },
+  "mappings": {
+    "_source": {
+      "mode": {{ source_mode | default("stored") | tojson }}
+    },
+    "properties": {
+      "key_100000000": {
+        "type": "keyword"
+      }
+    }
+  }
+}
diff --git a/joins/index-lookup_idx_1000000_f10.json b/joins/index-lookup_idx_1000000_f10.json
new file mode 100644
index 000000000..f9113d73c
--- /dev/null
+++ b/joins/index-lookup_idx_1000000_f10.json
@@ -0,0 +1,20 @@
+{% set p_include_non_serverless_index_settings = (include_non_serverless_index_settings | default(build_flavor != "serverless")) %}
+
+{
+  "settings": {
+        "index.mode": "lookup"
+    {# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
+    , "index.requests.cache.enable": false
+    {%- endif -%}{# non-serverless-index-settings-marker-end #}
+  },
+  "mappings": {
+    "_source": {
+      "mode": {{ source_mode | default("stored") | tojson }}
+    },
+    "properties": {
+      "key_1000000": {
+        "type": "keyword"
+      }
+    }
+  }
+}
diff --git a/joins/index-lookup_idx_100000_f10.json b/joins/index-lookup_idx_100000_f10.json
new file mode 100644
index 000000000..684e290bc
--- /dev/null
+++ b/joins/index-lookup_idx_100000_f10.json
@@ -0,0 +1,20 @@
+{% set p_include_non_serverless_index_settings = (include_non_serverless_index_settings | default(build_flavor != "serverless")) %}
+
+{
+  "settings": {
+        "index.mode": "lookup"
+    {# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
+    , "index.requests.cache.enable": false
+    {%- endif -%}{# non-serverless-index-settings-marker-end #}
+  },
+  "mappings": {
+    "_source": {
+      "mode": {{ source_mode | default("stored") | tojson }}
+    },
+    "properties": {
+      "key_100000": {
+        "type": "keyword"
+      }
+    }
+  }
+}
diff --git a/joins/index-lookup_idx_1000_f10.json b/joins/index-lookup_idx_1000_f10.json
new file mode 100644
index 000000000..0cdd4b672
--- /dev/null
+++ b/joins/index-lookup_idx_1000_f10.json
@@ -0,0 +1,20 @@
+{% set p_include_non_serverless_index_settings = (include_non_serverless_index_settings | default(build_flavor != "serverless")) %}
+
+{
+  "settings": {
+        "index.mode": "lookup"
+    {# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
+    , "index.requests.cache.enable": false
+    {%- endif -%}{# non-serverless-index-settings-marker-end #}
+  },
+  "mappings": {
+    "_source": {
+      "mode": {{ source_mode | default("stored") | tojson }}
+    },
+    "properties": {
+      "key_1000": {
+        "type": "keyword"
+      }
+    }
+  }
+}
diff --git a/joins/index-lookup_idx_200000_f10.json b/joins/index-lookup_idx_200000_f10.json
new file mode 100644
index 000000000..51f9b3d77
--- /dev/null
+++ b/joins/index-lookup_idx_200000_f10.json
@@ -0,0 +1,20 @@
+{% set p_include_non_serverless_index_settings = (include_non_serverless_index_settings | default(build_flavor != "serverless")) %}
+
+{
+  "settings": {
+        "index.mode": "lookup"
+    {# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
+    , "index.requests.cache.enable": false
+    {%- endif -%}{# non-serverless-index-settings-marker-end #}
+  },
+  "mappings": {
+    "_source": {
+      "mode": {{ source_mode | default("stored") | tojson }}
+    },
+    "properties": {
+      "key_200000": {
+        "type": "keyword"
+      }
+    }
+  }
+}
diff --git a/joins/index-lookup_idx_5000000_f10.json b/joins/index-lookup_idx_5000000_f10.json
new file mode 100644
index 000000000..7743a0848
--- /dev/null
+++ b/joins/index-lookup_idx_5000000_f10.json
@@ -0,0 +1,20 @@
+{% set p_include_non_serverless_index_settings = (include_non_serverless_index_settings | default(build_flavor != "serverless")) %}
+
+{
+  "settings": {
+        "index.mode": "lookup"
+    {# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
+    , "index.requests.cache.enable": false
+    {%- endif -%}{# non-serverless-index-settings-marker-end #}
+  },
+  "mappings": {
+    "_source": {
+      "mode": {{ source_mode | default("stored") | tojson }}
+    },
+    "properties": {
+      "key_5000000": {
+        "type": "keyword"
+      }
+    }
+  }
+}
diff --git a/joins/index-lookup_idx_500000_f10.json b/joins/index-lookup_idx_500000_f10.json
new file mode 100644
index 000000000..a73569141
--- /dev/null
+++ b/joins/index-lookup_idx_500000_f10.json
@@ -0,0 +1,20 @@
+{% set p_include_non_serverless_index_settings = (include_non_serverless_index_settings | default(build_flavor != "serverless")) %}
+
+{
+  "settings": {
+        "index.mode": "lookup"
+    {# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
+    , "index.requests.cache.enable": false
+    {%- endif -%}{# non-serverless-index-settings-marker-end #}
+  },
+  "mappings": {
+    "_source": {
+      "mode": {{ source_mode | default("stored") | tojson }}
+    },
+    "properties": {
+      "key_500000": {
+        "type": "keyword"
+      }
+    }
+  }
+}
diff --git a/joins/operations/default.json b/joins/operations/default.json
new file mode 100644
index 000000000..debf0530c
--- /dev/null
+++ b/joins/operations/default.json
@@ -0,0 +1,243 @@
+    {
+      "name": "index-base",
+      "operation-type": "bulk",
+      "indices": [
+        "join_base_idx"
+      ],
+      "bulk-size": {{bulk_size | default(10000)}},
+      "ingest-percentage": {{ingest_percentage | default(100)}}
+    },
+    {
+      "name": "index-small-lookup-indices",
+      "operation-type": "bulk",
+      "indices": [
+        "lookup_idx_1000_f10",
+        "lookup_idx_100000_f10",
+        "lookup_idx_200000_f10",
+        "lookup_idx_500000_f10"
+      ],
+      "bulk-size": {{bulk_size | default(10000)}},
+      "ingest-percentage": 100
+    },
+    {
+      "name": "index-lookup-1m",
+      "operation-type": "bulk",
+      "indices": ["lookup_idx_1000000_f10"],
+      "bulk-size": {{bulk_size | default(10000)}},
+      "ingest-percentage": {{ingest_percentage | default(100)}}
+    },
+    {
+      "name": "index-lookup-5m",
+      "operation-type": "bulk",
+      "indices": ["lookup_idx_5000000_f10"],
+      "bulk-size": {{bulk_size | default(10000)}},
+      "ingest-percentage": {{ingest_percentage | default(100)}}
+    },
+    {
+      "name": "index-lookup-100m",
+      "operation-type": "bulk",
+      "indices": ["lookup_idx_100000000_f10"],
+      "bulk-size": {{bulk_size | default(10000)}},
+      "ingest-percentage": {{ingest_percentage | default(100)}}
+    },
+
+    {
+      "name": "esql_lookup_join_1k_keys_limit1",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_1000_f10 on key_1000 | limit 1"
+    },
+    {
+      "name": "esql_lookup_join_1k_keys_limit1000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_1000_f10 on key_1000 | limit 1000"
+    },
+    {
+      "name": "esql_lookup_join_1k_keys_limit10000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_1000_f10 on key_1000 | limit 10000"
+    },
+    {
+      "name": "esql_lookup_join_1k_keys_where_limit1000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_1000_f10 on key_1000 | where lookup_keyword_0 like \"val 1*\" | limit 1000"
+    },
+    {
+      "name": "esql_lookup_join_1k_keys_where_no_match",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_1000_f10 on key_1000 | where concat(lookup_keyword_0, \"foo\") == \"bar\""
+    },
+
+
+    {
+      "name": "esql_lookup_join_100k_keys_limit1",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_100000_f10 on key_100000 | limit 1"
+    },
+    {
+      "name": "esql_lookup_join_100k_keys_limit1000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_100000_f10 on key_100000 | limit 1000"
+    },
+    {
+      "name": "esql_lookup_join_100k_keys_limit10000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_100000_f10 on key_100000 | limit 10000"
+    },
+    {
+      "name": "esql_lookup_join_100k_keys_where_limit1000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_100000_f10 on key_100000 | where lookup_keyword_0 like \"val 1*\" | limit 1000"
+    },
+    {
+      "name": "esql_lookup_join_100k_keys_where_no_match",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_100000_f10 on key_100000 | where concat(lookup_keyword_0, \"foo\") == \"bar\""
+    },
+
+
+    {
+      "name": "esql_lookup_join_200k_keys_limit1",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_200000_f10 on key_200000 | limit 1"
+    },
+    {
+      "name": "esql_lookup_join_200k_keys_limit1000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_200000_f10 on key_200000 | limit 1000"
+    },
+    {
+      "name": "esql_lookup_join_200k_keys_limit10000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_200000_f10 on key_200000 | limit 10000"
+    },
+    {
+      "name": "esql_lookup_join_200k_keys_where_limit1000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_200000_f10 on key_200000 | where lookup_keyword_0 like \"val 1*\" | limit 1000"
+    },
+    {
+      "name": "esql_lookup_join_200k_keys_where_no_match",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_200000_f10 on key_200000 | where concat(lookup_keyword_0, \"foo\") == \"bar\""
+    },
+
+
+    {
+      "name": "esql_lookup_join_500k_keys_limit1",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_500000_f10 on key_500000 | limit 1"
+    },
+    {
+      "name": "esql_lookup_join_500k_keys_limit1000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_500000_f10 on key_500000 | limit 1000"
+    },
+    {
+      "name": "esql_lookup_join_500k_keys_limit10000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_500000_f10 on key_500000 | limit 10000"
+    },
+    {
+      "name": "esql_lookup_join_500k_keys_where_limit1000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_500000_f10 on key_500000 | where lookup_keyword_0 like \"val 1*\" | limit 1000"
+    },
+    {
+      "name": "esql_lookup_join_500k_keys_where_no_match",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_500000_f10 on key_500000 | where concat(lookup_keyword_0, \"foo\") == \"bar\""
+    },
+
+
+    {
+      "name": "esql_lookup_join_1M_keys_limit1",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_1000000_f10 on key_1000000 | limit 1"
+    },
+    {
+      "name": "esql_lookup_join_1M_keys_limit1000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_1000000_f10 on key_1000000 | limit 1000"
+    },
+    {
+      "name": "esql_lookup_join_1M_keys_limit10000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_1000000_f10 on key_1000000 | limit 10000"
+    },
+    {
+      "name": "esql_lookup_join_1M_keys_where_limit1000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_1000000_f10 on key_1000000 | where lookup_keyword_0 like \"val 1*\" | limit 1000"
+    },
+    {
+      "name": "esql_lookup_join_1M_keys_where_no_match",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_1000000_f10 on key_1000000 | where concat(lookup_keyword_0, \"foo\") == \"bar\""
+    },
+
+
+    {
+      "name": "esql_lookup_join_5M_keys_limit1",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_5000000_f10 on key_5000000 | limit 1"
+    },
+    {
+      "name": "esql_lookup_join_5M_keys_limit1000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_5000000_f10 on key_5000000 | limit 1000"
+    },
+    {
+      "name": "esql_lookup_join_5M_keys_limit10000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_5000000_f10 on key_5000000 | limit 10000"
+    },
+    {
+      "name": "esql_lookup_join_5M_keys_where_limit1000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_5000000_f10 on key_5000000 | where lookup_keyword_0 like \"val 1*\" | limit 1000"
+    },
+    {
+      "name": "esql_lookup_join_5M_keys_where_no_match",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_5000000_f10 on key_5000000 | where concat(lookup_keyword_0, \"foo\") == \"bar\""
+    },
+
+
+    {
+      "name": "esql_lookup_join_100M_keys_limit1",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_100000000_f10 on key_100000000 | limit 1"
+    },
+    {
+      "name": "esql_lookup_join_100M_keys_limit1000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_100000000_f10 on key_100000000 | limit 1000"
+    },
+    {
+      "name": "esql_lookup_join_100M_keys_limit10000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_100000000_f10 on key_100000000 | limit 10000"
+    },
+    {
+      "name": "esql_lookup_join_100M_keys_where_limit1000",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_100000000_f10 on key_100000000 | where lookup_keyword_0 like \"val 1*\" | limit 1000"
+    },
+    {
+      "name": "esql_lookup_join_100M_keys_where_no_match",
+      "operation-type": "esql",
+      "query": "FROM join_base_idx | lookup join lookup_idx_100000000_f10 on key_100000000 | where concat(lookup_keyword_0, \"foo\") == \"bar\""
+    },
+
+
+
+    {
+    "name": "esql_lookup_join_1k_100k_200k_500k",
+    "operation-type": "esql",
+    "query": "FROM join_base_idx | lookup join lookup_idx_1000_f10 on key_1000 | rename lookup_keyword_0 as lk_1k | lookup join lookup_idx_100000_f10 on key_100000 | rename lookup_keyword_0 as lk_100k | lookup join lookup_idx_200000_f10 on key_200000 | rename lookup_keyword_0 as lk_200k | lookup join lookup_idx_500000_f10 on key_500000 | rename lookup_keyword_0 as lk_500k | keep id, key_1000, key_100000, key_200000, key_500000, lk_1k, lk_100k, lk_200k, lk_500k | limit 1000"
+    }
+
+
+
+
+
diff --git a/joins/track.json b/joins/track.json
new file mode 100644
index 000000000..bd9498e3e
--- /dev/null
+++ b/joins/track.json
@@ -0,0 +1,160 @@
+{% import "rally.helpers" as rally with context %}
+
+{
+  "version": 2,
+  "description": "Indexes for JOIN tests",
+  "indices": [
+    {
+      "name": "join_base_idx",
+      "body": "index-join_base_idx.json"
+    },
+    {
+      "name": "lookup_idx_1000_f10",
+      "body": "index-lookup_idx_1000_f10.json"
+    },
+    {
+      "name": "lookup_idx_100000_f10",
+      "body": "index-lookup_idx_100000_f10.json"
+    },
+    {
+      "name": "lookup_idx_200000_f10",
+      "body": "index-lookup_idx_200000_f10.json"
+    },
+    {
+      "name": "lookup_idx_500000_f10",
+      "body": "index-lookup_idx_500000_f10.json"
+    },
+    {
+      "name": "lookup_idx_1000000_f10",
+      "body": "index-lookup_idx_1000000_f10.json"
+    },
+    {
+      "name": "lookup_idx_5000000_f10",
+      "body": "index-lookup_idx_5000000_f10.json"
+    },
+    {
+      "name": "lookup_idx_100000000_f10",
+      "body": "index-lookup_idx_100000000_f10.json"
+    }
+  ],
+  "corpora": [
+    {
+      "name": "lookup_idx_1000_f10",
+      "base-url": "https://rally-tracks.elastic.co/joins",
+      "documents": [
+        {
+          "target-index": "lookup_idx_1000_f10",
+          "source-file": "lookup_idx_1000_f10.json.bz2",
+          "#COMMENT": "Lookup index with 1000 documents and 1000 distinct keys (keyworks, \"0\"..\"999\")",
+          "document-count": 1000,
+          "compressed-bytes": 11229,
+          "uncompressed-bytes": 388790
+        }
+      ]
+    },
+    {
+      "name": "lookup_idx_100000_f10",
+      "base-url": "https://rally-tracks.elastic.co/joins",
+      "documents": [
+        {
+          "target-index": "lookup_idx_100000_f10",
+          "source-file": "lookup_idx_100000_f10.json.bz2",
+          "#COMMENT": "Lookup index with 100k documents and 100k distinct keys (keyworks, \"0\"..\"99999\")",
+          "document-count": 100000,
+          "compressed-bytes": 2248693,
+          "uncompressed-bytes": 41277790
+        }
+      ]
+    },
+    {
+      "name": "lookup_idx_200000_f10",
+      "base-url": "https://rally-tracks.elastic.co/joins",
+      "documents": [
+        {
+          "target-index": "lookup_idx_200000_f10",
+          "source-file": "lookup_idx_200000_f10.json.bz2",
+          "#COMMENT": "Lookup index with 200k documents and 200k distinct keys (keyworks, \"0\"..\"199999\")",
+          "document-count": 200000,
+          "compressed-bytes": 4616182,
+          "uncompressed-bytes": 83777790
+        }
+      ]
+    },
+    {
+      "name": "lookup_idx_500000_f10",
+      "base-url": "https://rally-tracks.elastic.co/joins",
+      "documents": [
+        {
+          "target-index": "lookup_idx_500000_f10",
+          "source-file": "lookup_idx_500000_f10.json.bz2",
+          "#COMMENT": "Lookup index with 500k documents and 500k distinct keys (keyworks, \"0\"..\"499999\")",
+          "document-count": 500000,
+          "compressed-bytes": 11826282,
+          "uncompressed-bytes": 211277790
+        }
+      ]
+    },
+    {
+      "name": "lookup_idx_1000000_f10",
+      "base-url": "https://rally-tracks.elastic.co/joins",
+      "documents": [
+        {
+          "target-index": "lookup_idx_1000000_f10",
+          "source-file": "lookup_idx_1000000_f10.json.bz2",
+          "#COMMENT": "Lookup index with 1M documents and 1M distinct keys (keyworks, \"0\"..\"999999\")",
+          "document-count": 1000000,
+          "compressed-bytes": 24054261,
+          "uncompressed-bytes": 424777790
+        }
+      ]
+    },
+    {
+      "name": "lookup_idx_5000000_f10",
+      "base-url": "https://rally-tracks.elastic.co/joins",
+      "documents": [
+        {
+          "target-index": "lookup_idx_5000000_f10",
+          "source-file": "lookup_idx_5000000_f10.json.bz2",
+          "#COMMENT": "Lookup index with 5M documents and 5M distinct keys (keyworks, \"0\"..\"4999999\")",
+          "document-count": 5000000,
+          "compressed-bytes": 125436508,
+          "uncompressed-bytes": 2172777790
+        }
+      ]
+    },
+    {
+      "name": "lookup_idx_100000000_f10",
+      "base-url": "https://rally-tracks.elastic.co/joins",
+      "documents": [
+        {
+          "target-index": "lookup_idx_100000000_f10",
+          "source-file": "lookup_idx_100000000_f10.json.bz2",
+          "#COMMENT": "Lookup index with 100M documents and 100M distinct keys (keyworks, \"0\"..\"99999999\")",
+          "document-count": 100000000,
+          "compressed-bytes": 2668827023,
+          "uncompressed-bytes": 44877777790
+        }
+      ]
+    },
+    {
+      "name": "join_base_idx",
+      "base-url": "https://rally-tracks.elastic.co/joins",
+      "documents": [
+        {
+          "target-index": "join_base_idx",
+          "source-file": "documents.json.bz2",
+          "#COMMENT": "This is the main index, ie. the FROM of the ES|QL queries. Below we have smaller and larger versions, up to 1B docs",
+          "document-count": 10000000,
+          "compressed-bytes": 1004521674,
+          "uncompressed-bytes": 43773344760
+        }
+      ]
+    }
+  ],
+  "operations": [
+    {{ rally.collect(parts="operations/*.json") }}
+  ],
+  "challenges": [
+    {{ rally.collect(parts="challenges/*.json") }}
+  ]
+}