diff --git a/pmc/test_procedures/default.json b/pmc/test_procedures/default.json
index 9221c150..e5f0723b 100644
--- a/pmc/test_procedures/default.json
+++ b/pmc/test_procedures/default.json
@@ -72,43 +72,43 @@
           "operation": "default",
           "warmup-iterations": 500,
           "iterations": 200,
-          "target-throughput": {{ target_throughput | default(20) | tojson }},
-          "clients": {{ search_clients | default(1) }}
+          "target-throughput": {{ default_target_throughput or target_throughput | default(20) | tojson }},
+          "clients": {{ default_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "term",
           "warmup-iterations": 500,
           "iterations": 200,
-          "target-throughput": {{ target_throughput | default(20) | tojson }},
-          "clients": {{ search_clients | default(1) }}
+          "target-throughput": {{ term_target_throughput or target_throughput | default(20) | tojson }},
+          "clients": {{ term_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "phrase",
           "warmup-iterations": 500,
           "iterations": 200,
-          "target-throughput": {{ target_throughput | default(20) | tojson }},
-          "clients": {{ search_clients | default(1) }}
+          "target-throughput": {{ phrase_target_throughput or target_throughput | default(20) | tojson }},
+          "clients": {{ phrase_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "articles_monthly_agg_uncached",
           "warmup-iterations": 500,
           "iterations": 200,
-          "target-throughput": {{ target_throughput | default(20) | tojson }},
-          "clients": {{ search_clients | default(1) }}
+          "target-throughput": {{ articles_monthly_agg_uncached_target_throughput or target_throughput | default(20) | tojson }},
+          "clients": {{ articles_monthly_agg_uncached_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "articles_monthly_agg_cached",
           "warmup-iterations": 500,
           "iterations": 200,
-          "target-throughput": {{ target_throughput | default(20) | tojson }},
-          "clients": {{ search_clients | default(1) }}
+          "target-throughput": {{ articles_monthly_agg_cached_target_throughput or target_throughput | default(20) | tojson }},
+          "clients": {{ articles_monthly_agg_cached_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "scroll",
           "warmup-iterations": 50,
           "iterations": 100,
-          "target-throughput": {{ target_throughput | default(0.5) | tojson }},
-          "clients": {{ search_clients | default(1) }}
+          "target-throughput": {{ scroll_target_throughput or target_throughput | default(0.5) | tojson }},
+          "clients": {{ scroll_search_clients or search_clients | default(1) }}
         }
       ]
     },
diff --git a/pmc/test_procedures/indexing-querying.json b/pmc/test_procedures/indexing-querying.json
index 19caa8a3..0aa68e47 100644
--- a/pmc/test_procedures/indexing-querying.json
+++ b/pmc/test_procedures/indexing-querying.json
@@ -92,43 +92,43 @@
             "operation": "default",
             "warmup-iterations": 500,
             "iterations": 200,
-            "target-throughput": {{ target_throughput | default(20) | tojson }},
-            "clients": {{ search_clients | default(1) }}
+            "target-throughput": {{ default_target_throughput or target_throughput | default(20) | tojson }},
+            "clients": {{ default_search_clients or search_clients | default(1) }}
           },
           {
             "operation": "term",
             "warmup-iterations": 500,
             "iterations": 200,
-            "target-throughput": {{ target_throughput | default(20) | tojson }},
-            "clients": {{ search_clients | default(1) }}
+            "target-throughput": {{ term_target_throughput or target_throughput | default(20) | tojson }},
+            "clients": {{ term_search_clients or search_clients | default(1) }}
           },
           {
             "operation": "phrase",
             "warmup-iterations": 500,
             "iterations": 200,
-            "target-throughput": {{ target_throughput | default(20) | tojson }},
-            "clients": {{ search_clients | default(1) }}
+            "target-throughput": {{ phrase_target_throughput or target_throughput | default(20) | tojson }},
+            "clients": {{ phrase_search_clients or search_clients | default(1) }}
           },
           {
             "operation": "articles_monthly_agg_uncached",
             "warmup-iterations": 500,
             "iterations": 200,
-            "target-throughput": {{ target_throughput | default(20) | tojson }},
-            "clients": {{ search_clients | default(1) }}
+            "target-throughput": {{ articles_monthly_agg_uncached_target_throughput or target_throughput | default(20) | tojson }},
+            "clients": {{ articles_monthly_agg_uncached_search_clients or search_clients | default(1) }}
           },
           {
             "operation": "articles_monthly_agg_cached",
             "warmup-iterations": 500,
             "iterations": 200,
-            "target-throughput": {{ target_throughput | default(20) | tojson }},
-            "clients": {{ search_clients | default(1) }}
+            "target-throughput": {{ articles_monthly_agg_cached_target_throughput or target_throughput | default(20) | tojson }},
+            "clients": {{ articles_monthly_agg_cached_search_clients or search_clients | default(1) }}
           },
           {
             "operation": "scroll",
             "warmup-iterations": 50,
             "iterations": 100,
-            "target-throughput": {{ target_throughput | default(0.5) | tojson }},
-            "clients": {{ search_clients | default(1) }}
+            "target-throughput": {{ scroll_target_throughput or target_throughput | default(0.5) | tojson }},
+            "clients": {{ scroll_search_clients or search_clients | default(1) }}
           }
         ]
       }