diff --git a/experiments/17-chbenchmark/scale_down/COND b/experiments/17-chbenchmark/scale_down/COND
index ee3a78a8..fc283ad9 100644
--- a/experiments/17-chbenchmark/scale_down/COND
+++ b/experiments/17-chbenchmark/scale_down/COND
@@ -16,7 +16,7 @@ run_experiment(
     "txn-scale-factor": 1,  # TBD
     "t-clients": 4,  # TBD
     "num-front-ends": 5, # TBD
-    "run-for-s": 1 * 60 * 60,  # 1 hour
+    "run-for-s": 2 * 60 * 60,  # 1 hour
     "txn-zipfian-alpha": ZIPFIAN_ALPHA,
     "ra-query-indexes": QUERIES_STR,
     "ra-query-bank-file": "../../../workloads/chbenchmark/queries.sql",
diff --git a/experiments/17-chbenchmark/scale_down/run_full.sh b/experiments/17-chbenchmark/scale_down/run_full.sh
index f06a0504..4d9f43ee 100755
--- a/experiments/17-chbenchmark/scale_down/run_full.sh
+++ b/experiments/17-chbenchmark/scale_down/run_full.sh
@@ -10,12 +10,11 @@ abs_txn_config_file=$(realpath $txn_config_file)
 abs_system_config_file=$(realpath $system_config_file)
 abs_physical_config_file=$(realpath $physical_config_file)
 
-export BRAD_IGNORE_BLUEPRINT=1
 start_brad $abs_system_config_file $abs_physical_config_file
 
 sleep 30
 
-run_tpcc "t_1"
+run_tpcc "t_4"
 start_repeating_olap_runner 1 10 5 $ra_query_indexes "ch_1" $t_clients
 ra_pid=$runner_pid
 
diff --git a/experiments/17-chbenchmark/scale_down/set_up_starting_blueprint.sh b/experiments/17-chbenchmark/scale_down/set_up_starting_blueprint.sh
index 1735545e..77ac577b 100755
--- a/experiments/17-chbenchmark/scale_down/set_up_starting_blueprint.sh
+++ b/experiments/17-chbenchmark/scale_down/set_up_starting_blueprint.sh
@@ -12,8 +12,8 @@ source ../common.sh
 python3 ../../../workloads/IMDB_extended/set_up_starting_blueprint.py \
   --schema-name chbenchmark \
   --query-bank-file ../../../workloads/chbenchmark/queries.sql \
-  --redshift-queries "0,1,2,3,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21" \
-  --athena-queries "4" \
+  --redshift-queries "0,1,2,3,5,6,7,8,10,11,12,13,14,15,16,18,19,20,21" \
+  --athena-queries "4,9,17" \
   --redshift-provisioning "dc2.large:16" \
   --aurora-provisioning "db.r6g.2xlarge:1" \
   --system-config-file ch_scale_down_config.yml \