diff --git a/.github/workflows/build-app-beta.yaml b/.github/workflows/build-app-beta.yaml
index 7068b4e86..43640f2c5 100644
--- a/.github/workflows/build-app-beta.yaml
+++ b/.github/workflows/build-app-beta.yaml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         # os: [ubuntu-18.04, windows-2016]
-        os: [macOS-10.15, windows-2016, ubuntu-18.04]
+        os: [macOS-10.15, windows-2021, ubuntu-18.04]
 
     steps:
       - name: Context
diff --git a/.github/workflows/build-app.yaml b/.github/workflows/build-app.yaml
index ae280b3ab..6012235de 100644
--- a/.github/workflows/build-app.yaml
+++ b/.github/workflows/build-app.yaml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         # os: [ubuntu-18.04, windows-2016]
-        os: [macOS-10.15, windows-2016, ubuntu-18.04]
+        os: [macOS-10.15, windows-2021, ubuntu-18.04]
 
     steps:
       - name: Context
@@ -118,7 +118,7 @@ jobs:
       #     mv app/dist/latest.yml artifacts/latest.yml || true
 
       - name: Copy latest.yml (windows)
-        if: matrix.os == 'windows-2016'
+        if: matrix.os == 'windows-2021'
         run: |
           mv app/dist/latest.yml artifacts/latest.yml || true
           mv app/dist/dbgate-pad.xml artifacts/ || true