diff --git a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/load.yml b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/load.yml
index ff22a7d..9835be9 100644
--- a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/load.yml
+++ b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/load.yml
@@ -28,8 +28,8 @@
       include: loadgen.yml
 
     - name: Load all datasets
-      shell: "ansible-playbook -i {{ inventory }} {{ runquery }} --extra-vars=\"query_file={{ dml }} report=false\""
-      with_fileglob:
-          - "{{ dml_dir }}/*"
+      shell: "ansible-playbook -i {{ inventory }} {{ runquery }} --extra-vars=\"query_file={{ dml_dir }}/load{{ dataset }}.sqlpp report=false\";
+      ansible ncs -i {{ inventory }} -m shell -a \"rm -f {{ data_dir }}/{{ dataset | lower}}.tbl*\""
+      with_items: "{{ dataset_import_order }}"
       loop_control:
-          loop_var: dml
+          loop_var: dataset
diff --git a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/settings.yml b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/settings.yml
index 17a3638..4f3030e 100644
--- a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/settings.yml
+++ b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/settings.yml
@@ -23,6 +23,8 @@
 # Datasets with a single file.
 centralized_datasets: ["Region", "Nation"]
 
+dataset_import_order: ["Region", "Nation", "Supplier", "Part", "Customer", "Partsupp", "Orders", "LineItem"]
+
 # Temp directory.
 temp_dir: "/tmp/asterixdb"
 
diff --git a/asterixdb/asterix-benchmark/src/main/resources/others/SparkSQL/ansible/load_tpch.yml b/asterixdb/asterix-benchmark/src/main/resources/others/SparkSQL/ansible/load_tpch.yml
index ea635f4..5b07eed 100644
--- a/asterixdb/asterix-benchmark/src/main/resources/others/SparkSQL/ansible/load_tpch.yml
+++ b/asterixdb/asterix-benchmark/src/main/resources/others/SparkSQL/ansible/load_tpch.yml
@@ -30,4 +30,4 @@
     - include_vars: "{{ playbook_dir }}/../conf/private_ip.yml"
     - include_vars: ../../../benchmarks/tpch/gen/settings.yml
     - name: Put data on to HDFS
-      shell: for i in `ls -S {{ data_dir }}/`; do {{ hadoop_base }}/bin/hdfs dfs -put -f {{ data_dir }}/$i hdfs://{{ cc_ip }}:9000/{{ data_dir }}; rm {{ data_dir }}/$i; done
\ No newline at end of file
+      shell: for i in `ls -rS {{ data_dir }}/`; do {{ hadoop_base }}/bin/hdfs dfs -put -f {{ data_dir }}/$i hdfs://{{ cc_ip }}:9000/{{ data_dir }}; rm {{ data_dir }}/$i; done
\ No newline at end of file
diff --git a/asterixdb/asterix-benchmark/src/main/resources/others/SparkSQL/run_sparksql.sh b/asterixdb/asterix-benchmark/src/main/resources/others/SparkSQL/run_sparksql.sh
index 9b14f67..18d4962 100755
--- a/asterixdb/asterix-benchmark/src/main/resources/others/SparkSQL/run_sparksql.sh
+++ b/asterixdb/asterix-benchmark/src/main/resources/others/SparkSQL/run_sparksql.sh
@@ -45,14 +45,14 @@
    exit 1
 fi
 # Load data
-ansible-playbook  -i $INVENTORY $SCRIPT_PATH/../../benchmarks/tpch/gen/gen.yml
+ansible-playbook -i $INVENTORY $SCRIPT_PATH/../../benchmarks/tpch/gen/gen.yml
 # Configure HDFS
-ansible-playbook  -i $INVENTORY $SCRIPT_PATH/ansible/install_hdfs.yml
-ansible-playbook  -i $INVENTORY $SCRIPT_PATH/ansible/start_hdfs.yml
+ansible-playbook -i $INVENTORY $SCRIPT_PATH/ansible/install_hdfs.yml
+ansible-playbook -i $INVENTORY $SCRIPT_PATH/ansible/start_hdfs.yml
 # Configure Spark
-ansible-playbook  -i $INVENTORY $SCRIPT_PATH/ansible/install_spark.yml
-ansible-playbook  -i $INVENTORY $SCRIPT_PATH/ansible/start_spark.yml
-ansible-playbook  -i $INVENTORY $SCRIPT_PATH/ansible/load_tpch.yml
+ansible-playbook -i $INVENTORY $SCRIPT_PATH/ansible/install_spark.yml
+ansible-playbook -i $INVENTORY $SCRIPT_PATH/ansible/start_spark.yml
+ansible-playbook -i $INVENTORY $SCRIPT_PATH/ansible/load_tpch.yml
 # Execute queries
-ansible-playbook  -i $INVENTORY --extra-vars="metric='${SYSTEM_NAME}'" $SCRIPT_PATH/ansible/prepare_queries.yml
-ansible-playbook  -i $INVENTORY $SCRIPT_PATH/ansible/execute_queries.yml
\ No newline at end of file
+ansible-playbook -i $INVENTORY --extra-vars="metric='${SYSTEM_NAME}'" $SCRIPT_PATH/ansible/prepare_queries.yml
+ansible-playbook -i $INVENTORY $SCRIPT_PATH/ansible/execute_queries.yml
\ No newline at end of file