diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 753a6e3e85c75d70aa3e419e61a4c979c55cbd22..da53186b773d12c2f4b9f0a97a75ec26c38ab594 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,14 +33,17 @@ push_to_github:
   before_script:
     - export NVM_DIR="$HOME/.nvm"
     - . "$NVM_DIR/nvm.sh"
-  
-build:
-  <<: *nvm_env
-  stage: build
+
+.cached: &cached
   cache:
     untracked: true
     paths:
       - node_modules/
+  
+build:
+  <<: *nvm_env
+  <<: *cached
+  stage: build
   script:
     - yarn
 
@@ -70,16 +73,12 @@ pages:
 
 test:
   <<: *nvm_env
+  <<: *cached
   stage: test
-  cache:
-    untracked: true
-    paths:
-      - node_modules/
   script:
     - yarn test
     # Clean the dump directory before testing
     - rm -rf /tmp/duniter_ci_dump/
-    - mkdir -p /tmp/duniter_ci_dump/
     # Code coverage display in GitLab
     - tar cvzf coverage.tar.gz coverage/
     - sed -n 23p coverage/index.html | grep -Po "\d+.\d+" | sed -e "s/\(.*\)/<coverage>\1%<\/coverage>/"
@@ -89,18 +88,18 @@ test:
       - coverage.tar.gz
     expire_in: 4h
 
-test_sync:
+sync_g1:
   <<: *nvm_env
+  <<: *cached
   stage: test
-  cache:
-    untracked: true
-    paths:
-      - node_modules/
   script:
-    # Clean the dump directory before testing
-    - rm -rf /tmp/duniter_ci_dump/
-    - mkdir -p /tmp/duniter_ci_dump/
     - bash .gitlab/test/check_g1_sync.sh
+
+sync_gtest:
+  <<: *nvm_env
+  <<: *cached
+  stage: test
+  script:
     - bash .gitlab/test/check_gt_sync.sh
 
 .build_releases: &build_releases
diff --git a/.gitlab/test/check_indexes.sh b/.gitlab/test/check_indexes.sh
index 2285a57c5e215c51ff8b9b7d58f8c3d41f841263..b4b103ea7a88cc61a2dfc56a7f79344bdca8f536 100755
--- a/.gitlab/test/check_indexes.sh
+++ b/.gitlab/test/check_indexes.sh
@@ -3,8 +3,8 @@
 ORIGIN_DIR=`pwd`
 mkdir -p $1
 DUMP_DIR=`cd $1 && pwd`
-ARCHIVES="$DUMP_DIR/archives"
 CURRENCY=$2
+ARCHIVES="$DUMP_DIR/archives_$CURRENCY"
 DB_TEST="gitlab_ci_sync_test_$CURRENCY"
 G1_TARGET_BLOCK=$3 # This is a fixed block# which determines to the sha1 hashes
 G1_IINDEX_CS=$4