diff --git a/jenkins/opensearch/benchmark-test.jenkinsfile b/jenkins/opensearch/benchmark-test.jenkinsfile
index 6cbb60ec29..1fd31f24be 100644
--- a/jenkins/opensearch/benchmark-test.jenkinsfile
+++ b/jenkins/opensearch/benchmark-test.jenkinsfile
@@ -77,15 +77,15 @@ pipeline {
             H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=big5;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.xlarge,major-version:2x,cluster-config:arm64-r6g.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"big5_3_shards"};TEST_PROCEDURE=restore-from-snapshot
             H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=big5;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.xlarge,major-version:2x,cluster-config:x64-r5.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"big5_3_shards"};TEST_PROCEDURE=restore-from-snapshot
 
-            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
 
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
 
             H 8 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.xlarge,major-version:2x,cluster-config:arm64-r6g.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"http_logs_default"};TEST_PROCEDURE=restore-from-snapshot
             H 8 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=nyc_taxis;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.xlarge,major-version:2x,cluster-config:arm64-r6g.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"nyc_taxis_default"};TEST_PROCEDURE=restore-from-snapshot
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test-distribution-url.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test-distribution-url.jenkinsfile.txt
index 673fda1ef0..8a69e75b51 100644
--- a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test-distribution-url.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test-distribution-url.jenkinsfile.txt
@@ -57,15 +57,15 @@
             H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=big5;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.xlarge,major-version:2x,cluster-config:arm64-r6g.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"big5_3_shards"};TEST_PROCEDURE=restore-from-snapshot
             H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=big5;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.xlarge,major-version:2x,cluster-config:x64-r5.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"big5_3_shards"};TEST_PROCEDURE=restore-from-snapshot
 
-            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
 
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
 
             H 8 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.xlarge,major-version:2x,cluster-config:arm64-r6g.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"http_logs_default"};TEST_PROCEDURE=restore-from-snapshot
             H 8 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=nyc_taxis;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.xlarge,major-version:2x,cluster-config:arm64-r6g.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"nyc_taxis_default"};TEST_PROCEDURE=restore-from-snapshot
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test.jenkinsfile.txt
index df892135fb..6d85c992e7 100644
--- a/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/benchmark-test.jenkinsfile.txt
@@ -57,15 +57,15 @@
             H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=big5;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.xlarge,major-version:2x,cluster-config:arm64-r6g.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"big5_3_shards"};TEST_PROCEDURE=restore-from-snapshot
             H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=big5;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.xlarge,major-version:2x,cluster-config:x64-r5.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"big5_3_shards"};TEST_PROCEDURE=restore-from-snapshot
 
-            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
 
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
 
             H 8 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.xlarge,major-version:2x,cluster-config:arm64-r6g.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"http_logs_default"};TEST_PROCEDURE=restore-from-snapshot
             H 8 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=nyc_taxis;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.xlarge,major-version:2x,cluster-config:arm64-r6g.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"nyc_taxis_default"};TEST_PROCEDURE=restore-from-snapshot
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/secure-benchmark-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/secure-benchmark-test.jenkinsfile.txt
index 1e3437047b..eea516a37e 100644
--- a/tests/jenkins/jenkinsjob-regression-files/opensearch/secure-benchmark-test.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/secure-benchmark-test.jenkinsfile.txt
@@ -57,15 +57,15 @@
             H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=big5;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.xlarge,major-version:2x,cluster-config:arm64-r6g.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"big5_3_shards"};TEST_PROCEDURE=restore-from-snapshot
             H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=big5;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.xlarge,major-version:2x,cluster-config:x64-r5.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"big5_3_shards"};TEST_PROCEDURE=restore-from-snapshot
 
-            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 6 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.14.0/9820/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
 
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
-            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.4xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r5.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:x64,instance-type:r5.4xlarge,major-version:2x,cluster-config:x64-r5.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"false"};TEST_PROCEDURE=hybrid-query-aggs-full
+            H 7 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=noaa_semantic_search;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;DATA_INSTANCE_TYPE=r6g.2xlarge;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.4xlarge,major-version:2x,cluster-config:arm64-r6g.4xlarge-3-data-6-shards-0-replica-snapshot;WORKLOAD_PARAMS={"number_of_replicas":"1","number_of_shards":"6","max_num_segments":"8","concurrent_segment_search_enabled":"true"};TEST_PROCEDURE=hybrid-query-aggs-full
 
             H 8 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.xlarge,major-version:2x,cluster-config:arm64-r6g.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"http_logs_default"};TEST_PROCEDURE=restore-from-snapshot
             H 8 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.15.0/latest/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=nyc_taxis;SINGLE_NODE_CLUSTER=false;DATA_NODE_COUNT=3;USE_50_PERCENT_HEAP=true;USER_TAGS=run-type:nightly,segrep:disabled,arch:arm64,instance-type:r6g.xlarge,major-version:2x,cluster-config:arm64-r6g.xlarge-3-data-3-shards-0-replica-snapshot;WORKLOAD_PARAMS={"snapshot_repo_name":"benchmark-workloads-repo","snapshot_bucket_name":"benchmark-workload-snapshots","snapshot_region":"us-east-1","snapshot_base_path":"workload-snapshots","snapshot_name":"nyc_taxis_default"};TEST_PROCEDURE=restore-from-snapshot