diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1d3bff1..30b4cbc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
       shell: bash
       run: |
         curl -L -O https://github.com/msys2/msys2-installer/releases/download/2020-11-09/msys2-base-x86_64-20201109.tar.xz
-        tar -xvf msys2-base-x86_64-20201109.tar.xz --one-top-level=.build
+        tar -xvf msys2-base-x86_64-*.tar.xz --one-top-level=.build
 
     - name: Update MSYS
       run: |
diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml
new file mode 100644
index 0000000..0fc5762
--- /dev/null
+++ b/.github/workflows/deps.yml
@@ -0,0 +1,36 @@
+name: "Update latest msys base"
+
+on:
+  schedule:
+  - cron: "0 0 * * *"
+  pull_request:
+    paths:
+    - '.github/workflows/deps.yml'
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: main
+
+    - name: Update to latest
+      run: |
+        sed -i 's^https://github.com/msys2/msys2-installer/releases/.*.tar.xz^'$(curl --silent "https://api.github.com/repos/msys2/msys2-installer/releases/latest" | jq -r '.assets[] | select(.content_type == "application/x-xz") | .browser_download_url')'^g' .github/workflows/build.yml
+
+    - name: Become QMK Bot
+      run: |
+        git config user.name 'QMK Bot'
+        git config user.email 'hello@qmk.fm'
+
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v3
+      with:
+        base: main
+        delete-branch: true
+        author: QMK Bot <hello@qmk.fm>
+        committer: QMK Bot <hello@qmk.fm>
+        commit-message: Update latest msys base
+        title: '[CI] Update latest msys base'