diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8af9755..bd724a4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,10 +6,10 @@ jobs:
     steps:
       - checkout # check out the code in the project directory
       - restore_cache:
-          key: yarn-v1-packages-{{ checksum "yarn.lock" }}
+          key: yarn-v2-packages-{{ checksum "yarn.lock" }}
       - run: yarn global add node-gyp && yarn install
       - save_cache:
-          key: yarn-v1-packages-{{ checksum "yarn.lock" }}
+          key: yarn-v2-packages-{{ checksum "yarn.lock" }}
           paths:
             - ./node_modules
   lint:
@@ -18,10 +18,10 @@ jobs:
     steps:
       - checkout # check out the code in the project directory
       - restore_cache:
-          key: yarn-v1-packages-{{ checksum "yarn.lock" }}
+          key: yarn-v2-packages-{{ checksum "yarn.lock" }}
       - run: yarn lint && yarn format:check
       - save_cache:
-          key: yarn-v1-packages-{{ checksum "yarn.lock" }}
+          key: yarn-v2-packages-{{ checksum "yarn.lock" }}
           paths:
             - ./node_modules
   test:
@@ -30,10 +30,10 @@ jobs:
     steps:
       - checkout # check out the code in the project directory
       - restore_cache:
-          key: yarn-v1-packages-{{ checksum "yarn.lock" }}
+          key: yarn-v2-packages-{{ checksum "yarn.lock" }}
       - run: yarn test:ci
       - save_cache:
-          key: yarn-v1-packages-{{ checksum "yarn.lock" }}
+          key: yarn-v2-packages-{{ checksum "yarn.lock" }}
           paths:
             - ./node_modules
   test_e2e:
@@ -44,20 +44,20 @@ jobs:
           POSTGRES_DB: circleci_tp
           POSTGRES_PASSWORD: pdarcas
       - image: "circleci/node:12" # the primary container, where your job's commands are run
-        environement:
-          DATABASE_URL: postgres://pdarcas:pdarcas@localhost:5432/circleci_tp
-          JWT_SECRET: answer is 42
-          API_PORT: 3000
-          API_HOST: localhost
-          API_PROTOCOL: http
     steps:
       - checkout # check out the code in the project directory
       - restore_cache:
-          key: yarn-v1-packages-{{ checksum "yarn.lock" }}
+          key: yarn-v2-packages-{{ checksum "yarn.lock" }}
       - run: 
           command: yarn test:e2e
+          environement:
+            DATABASE_URL: postgres://pdarcas:pdarcas@localhost:5432/circleci_tp
+            JWT_SECRET: answer is 42
+            API_PORT: 3000
+            API_HOST: localhost
+            API_PROTOCOL: http
       - save_cache:
-          key: yarn-v1-packages-{{ checksum "yarn.lock" }}
+          key: yarn-v2-packages-{{ checksum "yarn.lock" }}
           paths:
             - ./node_modules