diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 6e81d3653..b9c156121 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -71,7 +71,7 @@ jobs:
           # The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
           # Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
           key: |
-            ${{ hashFiles( 'vcpkg_manifest/vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}
+            ${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}
 
       - name: Install dependencies
         run: |
@@ -103,12 +103,17 @@ jobs:
         run: |
           cd vcpkg
           ./bootstrap-vcpkg.sh
-          vcpkg install jsoncpp gtest boost-mpi boost-program-options tbb zlib --triplet ${{matrix.triplet}}
+          vcpkg install --triplet ${{matrix.triplet}}
           rm -rf buildtrees
           rm -rf packages
           rm -rf downloads
         shell: bash
 
+      - name: Compile tbb
+        uses: ./.github/workflows/compile-tbb   
+        with:
+          cmake: 'cmake'           
+
       - name: Download pre-compiled librairies
         uses: ./.github/workflows/download-extract-precompiled-libraries-zip
         with:
diff --git a/.github/workflows/centos7-system-deps-build.yml b/.github/workflows/centos7-system-deps-build.yml
index 25ecb97b1..ce1f69d4d 100644
--- a/.github/workflows/centos7-system-deps-build.yml
+++ b/.github/workflows/centos7-system-deps-build.yml
@@ -81,7 +81,9 @@ jobs:
           prefix: "../rte-antares-deps-Release/"
 
       - name: Compile tbb
-        uses: ./.github/workflows/compile-tbb
+        uses: ./.github/workflows/compile-tbb   
+        with:
+          cmake: 'cmake3'     
 
       - name: Configure
         run: |
diff --git a/.github/workflows/compile-tbb/action.yml b/.github/workflows/compile-tbb/action.yml
index d79ab1dd5..0db04eb49 100644
--- a/.github/workflows/compile-tbb/action.yml
+++ b/.github/workflows/compile-tbb/action.yml
@@ -1,5 +1,9 @@
 name: "Download and compile tbb"
 description: "tbb is required for execution policy (parallelization c++)."
+inputs:
+  cmake:
+    description: 'cmake version'
+    required: true
 runs:
   using: "composite"
   steps: 
@@ -8,5 +12,5 @@ runs:
     run: |  
       git clone https://github.com/wjakob/tbb.git 
       cd tbb/build 
-      cmake3 .. 
-      cmake3 --build . --target install -j8
\ No newline at end of file
+      ${{ inputs.cmake }} .. 
+      ${{ inputs.cmake }} --build . --target install -j8
\ No newline at end of file
diff --git a/.github/workflows/windows-vcpkg-deps-build.yml b/.github/workflows/windows-vcpkg-deps-build.yml
index f3ce6386c..38be25c1a 100644
--- a/.github/workflows/windows-vcpkg-deps-build.yml
+++ b/.github/workflows/windows-vcpkg-deps-build.yml
@@ -50,7 +50,7 @@ jobs:
           # The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
           # Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
           key: |
-            ${{ hashFiles( 'vcpkg_manifest/vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}-invalidate
+            ${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}-invalidate
 
       - name: Install dependencies
         run: |
@@ -76,12 +76,17 @@ jobs:
         run: |
           cd vcpkg
           ./bootstrap-vcpkg.sh
-          vcpkg install jsoncpp gtest boost-mpi boost-program-options tbb zlib --triplet ${{matrix.triplet}}
+          vcpkg install --triplet ${{matrix.triplet}}
           rm -rf buildtrees
           rm -rf packages
           rm -rf downloads
         shell: bash
 
+      - name: Compile tbb
+        uses: ./.github/workflows/compile-tbb   
+        with:
+          cmake: 'cmake'    
+
       - name: Configure
         run: |
           $pwd=Get-Location
diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml
index a836b7a33..6e87935af 100644
--- a/.github/workflows/windows-vcpkg.yml
+++ b/.github/workflows/windows-vcpkg.yml
@@ -103,7 +103,7 @@ jobs:
           # The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
           # Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
           key: |
-            ${{ hashFiles( 'vcpkg_manifest/vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}-invalidate
+            ${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}-invalidate
 
       - name: Install dependencies
         run: |
@@ -143,12 +143,17 @@ jobs:
         run: |
           cd vcpkg
           ./bootstrap-vcpkg.sh
-          vcpkg install jsoncpp gtest boost-mpi boost-program-options tbb zlib --triplet ${{matrix.triplet}}
+          vcpkg install --triplet ${{matrix.triplet}}
           rm -rf buildtrees
           rm -rf packages
           rm -rf downloads
         shell: bash
 
+      - name: Compile tbb
+        uses: ./.github/workflows/compile-tbb   
+        with:
+          cmake: 'cmake' 
+      
       - name: Download pre-compiled librairies
         uses: ./.github/workflows/download-extract-precompiled-libraries-zip
         with:
diff --git a/docker/centos7-bare b/docker/centos7-bare
index ea0a0ceee..69a7e027a 100644
--- a/docker/centos7-bare
+++ b/docker/centos7-bare
@@ -1,6 +1,6 @@
 FROM centos:7
 
-# Install requirements : update repo
+# Install requirements: update repo
 RUN yum update -y
 
 # Install requirements : install epel
@@ -30,4 +30,4 @@ RUN yum install -y python3-pip &&\
 
 #create user
 RUN useradd user
-# USER user
\ No newline at end of file
+# USER user
diff --git a/vcpkg b/vcpkg
index 01b29f6d8..9d47b24ea 160000
--- a/vcpkg
+++ b/vcpkg
@@ -1 +1 @@
-Subproject commit 01b29f6d8212bc845da64773b18665d682f5ab66
+Subproject commit 9d47b24eacbd1cd94f139457ef6cd35e5d92cc84
diff --git a/vcpkg_manifest/vcpkg.json b/vcpkg.json
similarity index 68%
rename from vcpkg_manifest/vcpkg.json
rename to vcpkg.json
index 6b77aff7b..e8d86672d 100644
--- a/vcpkg_manifest/vcpkg.json
+++ b/vcpkg.json
@@ -6,10 +6,6 @@
     "gtest",
     "boost-mpi",
     "boost-program-options",
-    "tbb",
     "zlib"
-  ],
-  "overrides": [
-    { "name": "tbb", "version": "2020_U3" }
   ]
-}
\ No newline at end of file
+}