diff --git a/.github/workflows/base_benchmarks.yml b/.github/workflows/base_benchmarks.yml
index a91d54ad6..7e9e3446a 100644
--- a/.github/workflows/base_benchmarks.yml
+++ b/.github/workflows/base_benchmarks.yml
@@ -25,16 +25,19 @@ jobs:
           python: 3.11
           os: ubuntu-22.04
       - name: Set env vars
-        run: cat ./extras/benchmarking/.env >> $GITHUB_ENV
+        run: cat ./extras/benchmarking/sync_v2/.env >> $GITHUB_ENV
       - name: Download benchmark data
         run: |
+          wget $BENCH_DATA_URL
+          tar -xzf $BENCH_DATA_FILE_NAME.tar.gz
           mkdir $SERVER_DATA_DIR
-          poetry run hathor-cli quick_test \
+          poetry run hathor-cli load-from-logs \
             --testnet \
             --data $SERVER_DATA_DIR \
             --cache \
             --cache-size $CACHE_SIZE \
-            --quit-after-n-blocks $N_BLOCKS
+            --x-localhost-only \
+            --log-dump $BENCH_DATA_FILE_NAME
       - name: Run server node
         run: |
           poetry run hathor-cli run_node \
@@ -48,11 +51,11 @@ jobs:
       - name: Track base branch benchmarks with Bencher
         run: |
           bencher run \
-          --project hathor-core \
-          --token '${{ secrets.BENCHER_API_TOKEN }}' \
-          --branch master \
-          --testbed ubuntu-22.04 \
-          --adapter shell_hyperfine \
-          --err \
-          --file $BENCH_FILE \
-          './extras/benchmarking/benchmark_sync_v2.sh'
+            --project hathor-core \
+            --token '${{ secrets.BENCHER_API_TOKEN }}' \
+            --branch master \
+            --testbed ubuntu-22.04 \
+            --adapter shell_hyperfine \
+            --err \
+            --file $BENCH_FILE \
+            './extras/benchmarking/sync_v2/benchmark_sync_v2.sh'
diff --git a/.github/workflows/pr_benchmarks.yml b/.github/workflows/pr_benchmarks.yml
index 40c9b2794..3e9c3cb6d 100644
--- a/.github/workflows/pr_benchmarks.yml
+++ b/.github/workflows/pr_benchmarks.yml
@@ -29,16 +29,19 @@ jobs:
           python: 3.11
           os: ubuntu-22.04
       - name: Set env vars
-        run: cat ./extras/benchmarking/.env >> $GITHUB_ENV
+        run: cat ./extras/benchmarking/sync_v2/.env >> $GITHUB_ENV
       - name: Download benchmark data
         run: |
+          wget $BENCH_DATA_URL
+          tar -xzf $BENCH_DATA_FILE_NAME.tar.gz
           mkdir $SERVER_DATA_DIR
-          poetry run hathor-cli quick_test \
+          poetry run hathor-cli load-from-logs \
             --testnet \
             --data $SERVER_DATA_DIR \
             --cache \
             --cache-size $CACHE_SIZE \
-            --quit-after-n-blocks $N_BLOCKS
+            --x-localhost-only \
+            --log-dump $BENCH_DATA_FILE_NAME
       - name: Run server node
         run: |
           poetry run hathor-cli run_node \
@@ -62,4 +65,4 @@ jobs:
             --err \
             --github-actions '${{ secrets.GITHUB_TOKEN }}' \
             --file $BENCH_FILE \
-            './extras/benchmarking/benchmark_sync_v2.sh'
+            './extras/benchmarking/sync_v2/benchmark_sync_v2.sh'
diff --git a/extras/benchmarking/.env b/extras/benchmarking/.env
deleted file mode 100644
index 4f22d614a..000000000
--- a/extras/benchmarking/.env
+++ /dev/null
@@ -1,7 +0,0 @@
-N_BLOCKS=20000
-CACHE_SIZE=100000
-SERVER_DATA_DIR=server-data
-TCP_PORT=40403
-N_RUNS=2
-BENCH_FILE=bench_results.json
-BENCH_DATA_DIR=bench-data
diff --git a/extras/benchmarking/sync_v2/.env b/extras/benchmarking/sync_v2/.env
new file mode 100644
index 000000000..73240719b
--- /dev/null
+++ b/extras/benchmarking/sync_v2/.env
@@ -0,0 +1,9 @@
+BENCH_DATA_FILE_NAME=ci_testnet_upto_20k
+BENCH_DATA_URL=https://hathor-public-files.s3.amazonaws.com/hathor-core-ci/ci_testnet_upto_20k.tar.gz
+N_BLOCKS=20000
+CACHE_SIZE=100000
+SERVER_DATA_DIR=server-data
+TCP_PORT=40403
+N_RUNS=2
+BENCH_FILE=testnet_upto_20k_results.json
+BENCH_DATA_DIR=bench-data
diff --git a/extras/benchmarking/benchmark_sync_v2.sh b/extras/benchmarking/sync_v2/benchmark_sync_v2.sh
similarity index 100%
rename from extras/benchmarking/benchmark_sync_v2.sh
rename to extras/benchmarking/sync_v2/benchmark_sync_v2.sh