diff --git a/elastic/logs/challenges/synthetic-source-recovery.json b/elastic/logs/challenges/synthetic-source-recovery.json
index 0042db12..577a2ec4 100644
--- a/elastic/logs/challenges/synthetic-source-recovery.json
+++ b/elastic/logs/challenges/synthetic-source-recovery.json
@@ -38,305 +38,15 @@
         "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
         "method": "GET",
         "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no | tojson }},
+          "from_seq_no": {{ p_recovery_from_seq_no | tojson }},
           "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
           "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
           "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
         }
       },
-      "warmup-iterations": 0,
-      "iterations": 1
+      "warmup-iterations": 10,
+      "iterations": 20
     },
-    {
-      "name": "shard-recovery-small_2",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_2 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large_3",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_3 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_4",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_4 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_5",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_5 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_6",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_6 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_7",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_7 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_8",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_8 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_9",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_9 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_10",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_10 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_11",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_11 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_12",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_12 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_13",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_13 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_14",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_14 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_15",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_15 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_16",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_16 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_17",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_17 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_18",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_18 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-small_19",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_small_from_seq_no_19 | tojson }},
-          "max_batch_size": {{ p_recovery_small_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-
-
     {
       "name": "shard-recovery-large",
       "operation": {
@@ -344,302 +54,14 @@
         "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
         "method": "GET",
         "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-2",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_2 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-3",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_3 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-4",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_4 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-5",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_5 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-6",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_6 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-7",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_7 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-8",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_8 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-9",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_9 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-10",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_10 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-11",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_11 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-12",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_12 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-13",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_13 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-14",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_14 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-15",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_15 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-16",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_16 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-17",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_17 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-18",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_18 | tojson }},
-          "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
-          "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
-          "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
-        }
-      },
-      "warmup-iterations": 0,
-      "iterations": 1
-    },
-    {
-      "name": "shard-recovery-large-19",
-      "operation": {
-        "operation-type": "raw-request",
-        "path": {{ "/%s/ccr/shard_changes" | format(p_recovery_target) | tojson }},
-        "method": "GET",
-        "request-params": {
-          "from_seq_no": {{ p_recovery_large_from_seq_no_19 | tojson }},
+          "from_seq_no": {{ p_recovery_from_seq_no | tojson }},
           "max_batch_size": {{ p_recovery_large_max_batch_size | tojson }},
           "poll_timeout": {{ p_recovery_poll_timeout | tojson }},
           "max_operations_count": {{ p_recovery_max_operations_count | tojson }}
         }
       },
-      "warmup-iterations": 0,
-      "iterations": 1
+      "warmup-iterations": 10,
+      "iterations": 20
     }
     {%- endif -%}{# serverless-shard-recovery-marker-end #}
   ]
diff --git a/elastic/logs/track.json b/elastic/logs/track.json
index 8b75b230..a4a67f89 100644
--- a/elastic/logs/track.json
+++ b/elastic/logs/track.json
@@ -62,50 +62,12 @@
 
 {% set p_recovery_target = (recovery_target | default('logs-k8-application.log-default') ) %}
 
-{% set p_recovery_small_from_seq_no = (recovery_seq_no | default(0) ) %}
-{% set p_recovery_small_from_seq_no_2 = (recovery_seq_no_2 | default(1000) ) %}
-{% set p_recovery_small_from_seq_no_3 = (recovery_seq_no_3 | default(2000) ) %}
-{% set p_recovery_small_from_seq_no_4 = (recovery_seq_no_4 | default(3000) ) %}
-{% set p_recovery_small_from_seq_no_5 = (recovery_seq_no_5 | default(4000) ) %}
-{% set p_recovery_small_from_seq_no_6 = (recovery_seq_no_6 | default(5000) ) %}
-{% set p_recovery_small_from_seq_no_7 = (recovery_seq_no_7 | default(6000) ) %}
-{% set p_recovery_small_from_seq_no_8 = (recovery_seq_no_8 | default(7000) ) %}
-{% set p_recovery_small_from_seq_no_9 = (recovery_seq_no_9 | default(8000) ) %}
-{% set p_recovery_small_from_seq_no_10 = (recovery_seq_no_10 | default(9000) ) %}
-{% set p_recovery_small_from_seq_no_11 = (recovery_seq_no_11 | default(10000) ) %}
-{% set p_recovery_small_from_seq_no_12 = (recovery_seq_no_12 | default(11000) ) %}
-{% set p_recovery_small_from_seq_no_13 = (recovery_seq_no_13 | default(12000) ) %}
-{% set p_recovery_small_from_seq_no_14 = (recovery_seq_no_14 | default(13000) ) %}
-{% set p_recovery_small_from_seq_no_15 = (recovery_seq_no_15 | default(14000) ) %}
-{% set p_recovery_small_from_seq_no_16 = (recovery_seq_no_16 | default(15000) ) %}
-{% set p_recovery_small_from_seq_no_17 = (recovery_seq_no_17 | default(16000) ) %}
-{% set p_recovery_small_from_seq_no_18 = (recovery_seq_no_18 | default(17000) ) %}
-{% set p_recovery_small_from_seq_no_19 = (recovery_seq_no_19 | default(18000) ) %}
-
-{% set p_recovery_large_from_seq_no = (recovery_seq_no | default(0) ) %}
-{% set p_recovery_large_from_seq_no_2 = (recovery_seq_no_2 | default(50000) ) %}
-{% set p_recovery_large_from_seq_no_3 = (recovery_seq_no_3 | default(100000) ) %}
-{% set p_recovery_large_from_seq_no_4 = (recovery_seq_no_4 | default(150000) ) %}
-{% set p_recovery_large_from_seq_no_5 = (recovery_seq_no_5 | default(200000) ) %}
-{% set p_recovery_large_from_seq_no_6 = (recovery_seq_no_6 | default(250000) ) %}
-{% set p_recovery_large_from_seq_no_7 = (recovery_seq_no_7 | default(300000) ) %}
-{% set p_recovery_large_from_seq_no_8 = (recovery_seq_no_8 | default(340000) ) %}
-{% set p_recovery_large_from_seq_no_9 = (recovery_seq_no_9 | default(400000) ) %}
-{% set p_recovery_large_from_seq_no_10 = (recovery_seq_no_10 | default(450000) ) %}
-{% set p_recovery_large_from_seq_no_11 = (recovery_seq_no_11 | default(500000) ) %}
-{% set p_recovery_large_from_seq_no_12 = (recovery_seq_no_12 | default(550000) ) %}
-{% set p_recovery_large_from_seq_no_13 = (recovery_seq_no_13 | default(600000) ) %}
-{% set p_recovery_large_from_seq_no_14 = (recovery_seq_no_14 | default(650000) ) %}
-{% set p_recovery_large_from_seq_no_15 = (recovery_seq_no_15 | default(700000) ) %}
-{% set p_recovery_large_from_seq_no_16 = (recovery_seq_no_16 | default(750000) ) %}
-{% set p_recovery_large_from_seq_no_17 = (recovery_seq_no_17 | default(800000) ) %}
-{% set p_recovery_large_from_seq_no_18 = (recovery_seq_no_18 | default(850000) ) %}
-{% set p_recovery_large_from_seq_no_19 = (recovery_seq_no_19 | default(900000) ) %}
+{% set p_recovery_from_seq_no = (recovery_seq_no | default(0) ) %}
 
 {% set p_recovery_small_max_batch_size = (recovery_small_max_batch_size | default ("512kB") ) %}
 {% set p_recovery_large_max_batch_size = (recovery_large_max_batch_size | default ("32MB") ) %}
 {% set p_recovery_poll_timeout = (recovery_poll_timeout | default("1m")) %}
-{% set p_recovery_max_operations_count = (recovery_max_operations_count | default(1000000)) %}
+{% set p_recovery_max_operations_count = (recovery_max_operations_count | default(16777216)) %}
 
 {% set p_worker_threads_enabled = (worker_threads_enabled | default(true))  %}