diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml
index 6a212547..f6c10848 100644
--- a/taskcluster/.shared.yml
+++ b/taskcluster/.shared.yml
@@ -138,3 +138,10 @@ system:
     osx: '/Users/build-user'
     win: '/c/builds/tc-workdir'
   sox_win: '/usr/bin/wget.exe https://sourceforge.net/projects/sox/files/sox/14.4.2/sox-14.4.2-win32.zip/download -O sox-14.4.2-win32.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_TASK_DIR/bin/ -tzip -aoa sox-14.4.2-win32.zip && rm sox-*zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/sox-14.4.2/:$PATH'
+  msys2:
+    url: 'https://github.com/msys2/msys2-installer/releases/download/2020-06-02/msys2-base-x86_64-20200602.tar.xz'
+    sha: '598ceeaa3e2ccf86a25a2e3c449d00a9fd35300e36011bee610036dfa59d670a'
+  msys2_filesystem_pkg:
+    url: 'http://repo.msys2.org/msys/x86_64/filesystem-2020.02-3-x86_64.pkg.tar.xz'
+    sha: '927b020a67a05139ee1b2c45bff491c1d42335e64350cc7758ee20d7c3099477'
+    install: 'pacman -Udd --noconfirm $USERPROFILE/filesystem-2020.02-3-x86_64.pkg.tar.xz'
diff --git a/taskcluster/generic_tc_caching-win-opt-base.tyml b/taskcluster/generic_tc_caching-win-opt-base.tyml
index a4110318..f96d4c6c 100644
--- a/taskcluster/generic_tc_caching-win-opt-base.tyml
+++ b/taskcluster/generic_tc_caching-win-opt-base.tyml
@@ -18,9 +18,12 @@ payload:
   mounts:
     - file: msys2-base-x86_64.tar.xz
       content:
-        sha256: c4443113497acb2d2e285d40b929fc55f33f8f669902595ecdf66a655b63dc60
-        url: >-
-          https://github.com/msys2/msys2-installer/releases/download/2020-05-17/msys2-base-x86_64-20200517.tar.xz
+        sha256: ${system.msys2.sha}
+        url: ${system.msys2.url}
+    - file: filesystem-2020.02-3-x86_64.pkg.tar.xz
+      content:
+        sha256: ${system.msys2_filesystem_pkg.sha}
+        url: ${system.msys2_filesystem_pkg.url}
 
   env:
     TC_MSYS_VERSION: 'MSYS_NT-6.3-9600'
@@ -31,6 +34,7 @@ payload:
       "C:\Program Files\7-zip\7z.exe" x -txz -so msys2-base-x86_64.tar.xz |
       "C:\Program Files\7-zip\7z.exe" x -o%USERPROFILE% -ttar -aoa -si
     - .\msys64\usr\bin\bash.exe --login -cx "export THIS_BASH_PID=$$; ps -ef | grep '[?]' | awk '{print $2}' | grep -v $THIS_BASH_PID | xargs -r kill; exit 0"
+    - .\msys64\usr\bin\bash.exe --login -cx "${system.msys2_filesystem_pkg.install}"
     - .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
     - .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
     - $let:
@@ -41,7 +45,7 @@ payload:
         export TASKCLUSTER_ARTIFACTS=\"$(cygpath -u $USERPROFILE/public)\" &&
         export TASKCLUSTER_TASK_DIR=\"/c/builds/tc-workdir/\" &&
         echo \"export TASKCLUSTER_TASK_EXIT_CODE=0\" > $USERPROFILE/tc-exit.sh &&
-        env && pacman --noconfirm -R bsdtar && pacman --noconfirm -S tar && mkdir -p $TASKCLUSTER_ARTIFACTS/ && if [ \"`curl -sSIL -o /dev/null -w %%{http_code} ${build.cache.artifact_url}`\" != \"200\" ]; then git clone --quiet ${build.build_or_cache.repo} $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir}/ && cd $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir} && git checkout --quiet ${build.build_or_cache.sha} && $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir}/${build.scripts.build} && $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir}/${build.scripts.package} && $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir}/taskcluster/tc-update-index.sh ${taskIndexExpire} taskcluster ${build.cache.artifact_namespace}; fi; echo \"export TASKCLUSTER_TASK_EXIT_CODE=$?\" > $USERPROFILE/tc-exit.sh" | cmd /k
+        env && pacman --noconfirm -S tar && mkdir -p $TASKCLUSTER_ARTIFACTS/ && if [ \"`curl -sSIL -o /dev/null -w %%{http_code} ${build.cache.artifact_url}`\" != \"200\" ]; then git clone --quiet ${build.build_or_cache.repo} $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir}/ && cd $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir} && git checkout --quiet ${build.build_or_cache.sha} && $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir}/${build.scripts.build} && $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir}/${build.scripts.package} && $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir}/taskcluster/tc-update-index.sh ${taskIndexExpire} taskcluster ${build.cache.artifact_namespace}; fi; echo \"export TASKCLUSTER_TASK_EXIT_CODE=$?\" > $USERPROFILE/tc-exit.sh" | cmd /k
 
     - .\msys64\usr\bin\bash.exe --login -cxe "source $USERPROFILE/tc-exit.sh && exit $TASKCLUSTER_TASK_EXIT_CODE"
 
diff --git a/taskcluster/test-win-cuda-opt-base.tyml b/taskcluster/test-win-cuda-opt-base.tyml
index e5dc5ee6..9fa37404 100644
--- a/taskcluster/test-win-cuda-opt-base.tyml
+++ b/taskcluster/test-win-cuda-opt-base.tyml
@@ -38,6 +38,7 @@ then:
         "C:\Program Files\7-zip\7z.exe" x -txz -so msys2-base-x86_64.tar.xz |
         "C:\Program Files\7-zip\7z.exe" x -o%USERPROFILE% -ttar -aoa -si
       - .\msys64\usr\bin\bash.exe --login -cx "export THIS_BASH_PID=$$; ps -ef | grep '[?]' | awk '{print $2}' | grep -v $THIS_BASH_PID | xargs -r kill; exit 0"
+      - .\msys64\usr\bin\bash.exe --login -cx "${system.msys2_filesystem_pkg.install}"
       - .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
       - .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
       - $let:
@@ -57,7 +58,6 @@ then:
           cd $TASKCLUSTER_TASK_DIR/DeepSpeech/ds && git checkout --quiet ${event.head.sha} &&
           cd $TASKCLUSTER_TASK_DIR &&
           (mkdir pyenv-root/ && 7z x -so $USERPROFILE/pyenv.tar.gz | 7z x -opyenv-root/ -aoa -ttar -si ) &&
-          pacman --noconfirm -R bsdtar &&
           pacman --noconfirm -S tar vim &&
           ${extraSystemSetup} &&
           /bin/bash ${build.args.tests_cmdline} ;
@@ -67,9 +67,12 @@ then:
     mounts:
       - file: msys2-base-x86_64.tar.xz
         content:
-          sha256: c4443113497acb2d2e285d40b929fc55f33f8f669902595ecdf66a655b63dc60
-          url: >-
-            https://github.com/msys2/msys2-installer/releases/download/2020-05-17/msys2-base-x86_64-20200517.tar.xz
+          sha256: ${system.msys2.sha}
+          url: ${system.msys2.url}
+      - file: filesystem-2020.02-3-x86_64.pkg.tar.xz
+        content:
+          sha256: ${system.msys2_filesystem_pkg.sha}
+          url: ${system.msys2_filesystem_pkg.url}
       - file: pyenv.tar.gz
         content:
           url: ${system.pyenv.win.url}
diff --git a/taskcluster/test-win-opt-base.tyml b/taskcluster/test-win-opt-base.tyml
index 4ddfa595..f8925d6d 100644
--- a/taskcluster/test-win-opt-base.tyml
+++ b/taskcluster/test-win-opt-base.tyml
@@ -40,6 +40,7 @@ then:
         "C:\Program Files\7-zip\7z.exe" x -txz -so msys2-base-x86_64.tar.xz |
         "C:\Program Files\7-zip\7z.exe" x -o%USERPROFILE% -ttar -aoa -si
       - .\msys64\usr\bin\bash.exe --login -cx "export THIS_BASH_PID=$$; ps -ef | grep '[?]' | awk '{print $2}' | grep -v $THIS_BASH_PID | xargs -r kill; exit 0"
+      - .\msys64\usr\bin\bash.exe --login -cx "${system.msys2_filesystem_pkg.install}"
       - .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
       - .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
       - $let:
@@ -59,7 +60,6 @@ then:
           cd $TASKCLUSTER_TASK_DIR/DeepSpeech/ds && git checkout --quiet ${event.head.sha} &&
           cd $TASKCLUSTER_TASK_DIR &&
           (mkdir pyenv-root/ && 7z x -so $USERPROFILE/pyenv.tar.gz | 7z x -opyenv-root/ -aoa -ttar -si ) &&
-          pacman --noconfirm -R bsdtar &&
           pacman --noconfirm -S tar vim &&
           ${extraSystemSetup} &&
           /bin/bash ${build.args.tests_cmdline} ;
@@ -69,9 +69,12 @@ then:
     mounts:
       - file: msys2-base-x86_64.tar.xz
         content:
-          sha256: c4443113497acb2d2e285d40b929fc55f33f8f669902595ecdf66a655b63dc60
-          url: >-
-            https://github.com/msys2/msys2-installer/releases/download/2020-05-17/msys2-base-x86_64-20200517.tar.xz
+          sha256: ${system.msys2.sha}
+          url: ${system.msys2.url}
+      - file: filesystem-2020.02-3-x86_64.pkg.tar.xz
+        content:
+          sha256: ${system.msys2_filesystem_pkg.sha}
+          url: ${system.msys2_filesystem_pkg.url}
       - file: pyenv.tar.gz
         content:
           url: ${system.pyenv.win.url}
diff --git a/taskcluster/win-opt-base.tyml b/taskcluster/win-opt-base.tyml
index ff1aa4a5..e7db49a4 100644
--- a/taskcluster/win-opt-base.tyml
+++ b/taskcluster/win-opt-base.tyml
@@ -40,6 +40,7 @@ payload:
       "C:\Program Files\7-zip\7z.exe" x -txz -so msys2-base-x86_64.tar.xz |
       "C:\Program Files\7-zip\7z.exe" x -o%USERPROFILE% -ttar -aoa -si
     - .\msys64\usr\bin\bash.exe --login -cx "export THIS_BASH_PID=$$; ps -ef | grep '[?]' | awk '{print $2}' | grep -v $THIS_BASH_PID | xargs -r kill; exit 0"
+    - .\msys64\usr\bin\bash.exe --login -cx "${system.msys2_filesystem_pkg.install}"
     - .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
     - .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
     - echo .\msys64\usr\bin\bash.exe --login -cxe "
@@ -58,7 +59,6 @@ payload:
       ln -s $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/native_client/ $TASKCLUSTER_TASK_DIR/DeepSpeech/tf/native_client &&
       cd $TASKCLUSTER_TASK_DIR &&
       (mkdir pyenv-root/ && 7z x -so $USERPROFILE/pyenv.tar.gz | 7z x -opyenv-root/ -aoa -ttar -si ) &&
-      pacman --noconfirm -R bsdtar &&
       pacman --noconfirm -S tar make &&
       pacman --noconfirm -S zip &&
       $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/${build.scripts.build} &&
@@ -73,9 +73,12 @@ payload:
   mounts:
     - file: msys2-base-x86_64.tar.xz
       content:
-        sha256: c4443113497acb2d2e285d40b929fc55f33f8f669902595ecdf66a655b63dc60
-        url: >-
-          https://github.com/msys2/msys2-installer/releases/download/2020-05-17/msys2-base-x86_64-20200517.tar.xz
+        sha256: ${system.msys2.sha}
+        url: ${system.msys2.url}
+    - file: filesystem-2020.02-3-x86_64.pkg.tar.xz
+      content:
+        sha256: ${system.msys2_filesystem_pkg.sha}
+        url: ${system.msys2_filesystem_pkg.url}
     - file: home.tar.xz
       content:
         url: ${build.tensorflow}