diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 6171af54f..0b90db952 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -62,7 +62,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
-        key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}
+        key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-r2
 
     # Setup compilation mode and install project dependencies
     - name: Configure xmake and install dependencies
@@ -70,7 +70,7 @@ jobs:
 
     # Build the engine
     - name: Build Nazara
-      run: xmake -v
+      run: xmake
 
     # Run unit tests
     - name: Run unit tests
diff --git a/.github/workflows/linux-build-sanitizer.yml b/.github/workflows/linux-build-sanitizer.yml
index 88fcde041..2e68e37c3 100644
--- a/.github/workflows/linux-build-sanitizer.yml
+++ b/.github/workflows/linux-build-sanitizer.yml
@@ -72,7 +72,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
-        key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}
+        key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-r2
 
     # Setup compilation mode and install project dependencies
     - name: Configure xmake and install dependencies
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 9e79b8f9e..18010a521 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -61,7 +61,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
-        key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}
+        key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-r2
 
     # Setup compilation mode and install project dependencies
     - name: Configure xmake and install dependencies
diff --git a/.github/workflows/msys2-build.yml b/.github/workflows/msys2-build.yml
index 0d84905c7..80855ab49 100644
--- a/.github/workflows/msys2-build.yml
+++ b/.github/workflows/msys2-build.yml
@@ -38,7 +38,7 @@ jobs:
     - uses: msys2/setup-msys2@v2
       with:
         msystem: ${{ matrix.msystem }}
-        install: git base-devel unzip p7zip mingw-w64-${{ matrix.arch }}-toolchain mingw-w64-${{ matrix.arch }}-qt5-tools
+        install: git base-devel unzip p7zip mingw-w64-${{ matrix.arch }}-toolchain
         update: true
 
     # Force xmake to a specific folder (for cache)
@@ -70,7 +70,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ${{ env.XMAKE_GLOBALDIR }}\.xmake\packages
-        key: MinGW-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}
+        key: MinGW-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-r2
 
     # Setup compilation mode and install project dependencies
     - name: Configure xmake and install dependencies
@@ -78,7 +78,7 @@ jobs:
 
     # Build the engine
     - name: Build Nazara
-      run: xmake -v
+      run: xmake
 
     # Install the result files
     - name: Install Nazara
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index e52fe5456..96c6e58c6 100644
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -53,7 +53,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ${{ env.XMAKE_GLOBALDIR }}\.xmake\packages
-        key: MSVC-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}
+        key: MSVC-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-r2
 
     # Setup compilation mode and install project dependencies
     - name: Configure xmake and install dependencies