diff --git a/.circleci/config.yml b/.circleci/config.yml
index a932ccb3..74d4b2e8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,18 +35,18 @@ orbs:
         steps:
           - run:
               name: Init opam
-              shell: C:/tools/cygwin/bin/bash.exe --noprofile --norc -eo pipefail
+              shell: C:/tools/cygwin/bin/bash.exe -leo pipefail
               command: |
-                export PATH=$PATH:/usr/local/bin:/usr/bin
                 [ -d ~/.opam ] || opam init default 'https://github.com/fdopen/opam-repository-mingw.git#opam2' --bare --disable-sandboxing
       create_switch:
         steps:
           - run:
               name: Create opam switch
-              shell: C:/tools/cygwin/bin/bash.exe --noprofile --norc -eo pipefail
+              shell: C:/tools/cygwin/bin/bash.exe -leo pipefail
               environment:
                 PATH: /usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0
               command: |
+                cd /cygdrive/c/Users/circleci/project
                 [ -d _opam ] || opam switch create . ocaml-variants.4.06.1+mingw64c --deps-only --yes -vvv
 
 executors:
@@ -206,10 +206,11 @@ jobs:
           at: ./artifacts
       - run:
           name: Check node / npm version
-          shell: C:/tools/cygwin/bin/bash.exe --noprofile --norc -eo pipefail
+          shell: C:/tools/cygwin/bin/bash.exe -leo pipefail
           environment:
             PATH: /cygdrive/c/Program Files/nodejs:/usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0
           command: |
+            cd /cygdrive/c/Users/circleci/project
             pwd
             ls -l
             echo "Versions"
@@ -217,28 +218,30 @@ jobs:
             npm --version
       - restore_cache:
           keys:
-          - v0-opam-cache-{{ arch }}
+          - v2-opam-cache-{{ arch }}
       - opam_windows/init
       - opam_windows/create_switch
       - run:
           name: Install opam dev dependencies
-          shell: C:/tools/cygwin/bin/bash.exe --noprofile --norc -eo pipefail
+          shell: C:/tools/cygwin/bin/bash.exe -leo pipefail
           environment:
             PATH: /cygdrive/c/Program Files/nodejs:/usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0
           command: |
+            cd /cygdrive/c/Users/circleci/project
             eval $(opam env)
             opam install reason.3.6.0 dune.1.11.4 ocaml-migrate-parsetree.1.3.1 ppx_tools_versioned uri --yes | cat
       - save_cache:
-          key: v0-opam-cache-{{ arch }}
+          key: v2-opam-cache-{{ arch }}
           paths:
             - C:/tools/cygwin/home/circleci/.opam
             - _opam
       - run:
           name: Build & Test
-          shell: C:/tools/cygwin/bin/bash.exe --noprofile --norc -eo pipefail
+          shell: C:/tools/cygwin/bin/bash.exe -leo pipefail
           environment:
             PATH: /cygdrive/c/Program Files/nodejs:/usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0
           command: |
+             cd /cygdrive/c/Users/circleci/project
              eval $(opam env)
              dune build
              ./_build/install/default/bin/rescript-editor-support.exe --help