diff --git a/vectorsearch/indices/train-index.json b/vectorsearch/indices/train-index.json
index ea499daf..ad75bbcd 100644
--- a/vectorsearch/indices/train-index.json
+++ b/vectorsearch/indices/train-index.json
@@ -13,7 +13,7 @@
       "properties": {
         "{{ train_field_name }}": {
           "type": "knn_vector",
-          "dimension": {{ target_index_dimension }}
+          "dimension": {{ target_index_dimension | default(-1) }}
         }
       }
     }
diff --git a/vectorsearch/test_procedures/common/train-model-schedule.json b/vectorsearch/test_procedures/common/train-model-schedule.json
index 11b74174..60557567 100644
--- a/vectorsearch/test_procedures/common/train-model-schedule.json
+++ b/vectorsearch/test_procedures/common/train-model-schedule.json
@@ -14,7 +14,7 @@
             "training_index": "{{ train_index_name | default('train_index') }}",
             "training_field": "{{ train_field_name | default('train_field') }}",
             "search_size": "{{ train_search_size | default(10000) }}", 
-            "dimension": {{ target_index_dimension }},
+            "dimension": {{ target_index_dimension | default(-1) }},
             {%- if train_max_vector_count is defined and train_max_vector_count %}
                 "max_training_vector_count": "{{ train_max_vector_count }}", 
             {%- endif %}
diff --git a/vectorsearch/workload.json b/vectorsearch/workload.json
index c5f2940c..fad1e057 100644
--- a/vectorsearch/workload.json
+++ b/vectorsearch/workload.json
@@ -4,11 +4,11 @@
     "description": "Benchmark vector search engine performance for different engine types like faiss, lucene and nmslib",
     "indices": [
         {
-            "name": "{{ target_index_name }}",
+            "name": "{{ target_index_name | default('target_index') }}",
             "body": "{{ target_index_body }}"
         },
         {
-            "name": "{{ train_index_name }}",
+            "name": "{{ train_index_name | default('train_index') }}",
             "body": "{{ train_index_body }}"
         }
     ],