diff --git a/tsdb/challenges/default.json b/tsdb/challenges/default.json
index 518bf290e..d868dfb7e 100644
--- a/tsdb/challenges/default.json
+++ b/tsdb/challenges/default.json
@@ -3,6 +3,20 @@
       "description": "Indexes the whole document corpus.",
       "default": true,
       "schedule": [
+        {
+          "name":"increase-max_buckets_setting",
+          "tags": ["setup"],
+          "operation": {
+            "operation-type": "raw-request",
+            "method": "PUT",
+            "path": "/_cluster/settings",
+            "body": {
+              "transient": {
+                "search.max_buckets" : 300000
+              }
+            }
+          }
+        },
         {%- if ingest_mode is defined and ingest_mode == "data_stream" %}
         {
           "name": "put-timestamp-pipeline",
@@ -123,6 +137,11 @@
           "operation": "date-histo-entire-range",
           "warmup-iterations": 50,
           "iterations": 100
+        },
+        {
+          "operation": "date-histo-with-time-series-1h",
+          "warmup-iterations": 50,
+          "iterations": 100
         }
       ]
     },
diff --git a/tsdb/operations/default.json b/tsdb/operations/default.json
index ab9efb03b..332af7e9b 100644
--- a/tsdb/operations/default.json
+++ b/tsdb/operations/default.json
@@ -74,7 +74,11 @@
     {
       "name": "date-histo-entire-range",
       "operation-type": "search",
+      {%- if ingest_mode is defined and ingest_mode == "data_stream" %}
+      "index": "k8s",
+      {%- else %}
       "index": "tsdb",
+      {%- endif %}
       "body": {
         "size": 0,
         "aggs": {
@@ -86,4 +90,43 @@
           }
         }
       }
-    }
+    },
+    {
+      "name": "date-histo-with-time-series-1h",
+      "operation-type": "search",
+      {%- if ingest_mode is defined and ingest_mode == "data_stream" %}
+      "index": "k8s",
+      {%- else %}
+      "index": "tsdb",
+      {%- endif %}
+      "body": {
+        "size": 0,
+        "aggs": {
+          "by_timestamp": {
+            "date_histogram": {
+              "field": "@timestamp",
+              "fixed_interval": "1h"
+            },
+            "aggs": {
+              "ts": {
+                "time_series": {
+                  "keyed": false
+                },
+                "aggs": {
+                  "available_memory": {
+                    "min": {
+                      "field": "kubernetes.node.memory.available.bytes"
+                    }
+                  }
+                }
+              },
+              "min_available_memory": {
+                "min_bucket": {
+                  "buckets_path": "ts>available_memory" 
+                }
+              }
+            }
+          }
+        }
+      }
+    }
\ No newline at end of file