diff --git a/.github/README.md b/.github/README.md
index b1229f86b..939a2010a 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -2,6 +2,7 @@
 
 [![CodeFactor](https://www.codefactor.io/repository/github/azerothcore/azerothcore-wotlk/badge)](https://www.codefactor.io/repository/github/azerothcore/azerothcore-wotlk)
 [![core-build](https://github.com/azerothcore/azerothcore-wotlk/workflows/core-build/badge.svg?branch=master&event=push)](https://github.com/azerothcore/azerothcore-wotlk/actions?query=workflow%3Acore-build+branch%3Amaster+event%3Apush)
+[![windows-build](https://github.com/azerothcore/azerothcore-wotlk/workflows/windows-build/badge.svg?branch=master&event=push)](https://github.com/azerothcore/azerothcore-wotlk/actions?query=workflow%3Awindows-build+branch%3Amaster+event%3Apush)
 [![macos-build](https://github.com/azerothcore/azerothcore-wotlk/workflows/macos-build/badge.svg?branch=master&event=push)](https://github.com/azerothcore/azerothcore-wotlk/actions?query=workflow%3Amacos-build+branch%3Amaster+event%3Apush)
 [![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=40032087)](https://www.bountysource.com/teams/azerothcore/bounties "Put money on issues or get paid for fixing them")
 [![StackOverflow](http://img.shields.io/badge/stackoverflow-azerothcore-blue.svg)](https://stackoverflow.com/questions/tagged/azerothcore?sort=newest "Ask / browse questions here")
diff --git a/.github/workflows/core_build.yml b/.github/workflows/core_build.yml
index 46decce54..9a67d4dff 100644
--- a/.github/workflows/core_build.yml
+++ b/.github/workflows/core_build.yml
@@ -82,33 +82,6 @@ jobs:
       - name: Run unit tests
         run: source ./apps/ci/ci-run-unit-tests.sh
 
-  windows-build:
-    strategy:
-      fail-fast: false
-    runs-on: windows-2019
-    name: windows-2019-MSVC16
-    if: github.repository == 'azerothcore/azerothcore-wotlk'
-    steps:
-      - uses: actions/checkout@v2
-      - name: Configure OS
-        run: choco install --no-progress openssl
-      - name: Build
-        shell: bash
-        run: |
-          mkdir -p build && cd build
-          cmake .. -DTOOLS=ON
-          cmake --build . --config Release --parallel 4
-      - name: Copy dll files
-        shell: bash
-        run: |
-          cp "/c/mysql-5.7.21-winx64/lib/libmysql.dll" "build/bin/Release/"
-          cp "/c/Program Files/OpenSSL-Win64/bin/libcrypto-1_1-x64.dll" "build/bin/Release/"
-          cp "/c/Program Files/OpenSSL-Win64/bin/libssl-1_1-x64.dll" "build/bin/Release/"
-      - uses: actions/upload-artifact@v2
-        with:
-          name: windows-2019-MSVC16-release
-          path: build/bin/Release
-
   docker-build-n-deploy:
     strategy:
       fail-fast: true
diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml
new file mode 100644
index 000000000..fccaf6fc7
--- /dev/null
+++ b/.github/workflows/windows_build.yml
@@ -0,0 +1,35 @@
+name: windows-build
+on:
+  push:
+    branches:
+      - '**'         # matches every branch
+      - '!coverity_scan'   # excludes coverity_scan
+  pull_request:
+
+jobs:
+  windows-build:
+    strategy:
+      fail-fast: false
+    runs-on: windows-2019
+    name: windows-2019-MSVC16
+    if: github.repository == 'azerothcore/azerothcore-wotlk'
+    steps:
+      - uses: actions/checkout@v2
+      - name: Configure OS
+        run: choco install --no-progress openssl
+      - name: Build
+        shell: bash
+        run: |
+          mkdir -p build && cd build
+          cmake .. -DTOOLS=ON
+          cmake --build . --config Release --parallel 4
+      - name: Copy dll files
+        shell: bash
+        run: |
+          cp "/c/mysql-5.7.21-winx64/lib/libmysql.dll" "build/bin/Release/"
+          cp "/c/Program Files/OpenSSL-Win64/bin/libcrypto-1_1-x64.dll" "build/bin/Release/"
+          cp "/c/Program Files/OpenSSL-Win64/bin/libssl-1_1-x64.dll" "build/bin/Release/"
+      - uses: actions/upload-artifact@v2
+        with:
+          name: windows-2019-MSVC16-release
+          path: build/bin/Release