diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index edac03c..dfb9721 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -2,14 +2,14 @@ name: C/C++ CI
 
 on:
   push:
+    tags:
+      - 'v*.*.*'
     branches:
-    - master
+      - master
 
 jobs:
-  build:
-
+  build-ubuntu:
     runs-on: ubuntu-latest
-    
     steps:
     - uses: actions/checkout@v1
     - name: Checkout submodules
@@ -18,9 +18,30 @@ jobs:
       uses: lpenz/ghaction-cmake@v0.1
     - name: GH Release
       uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')  
       with:
-        name: ${{github.sha}}
         files: |
           DBImporter
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  
+  build-windows:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest, windows-2016]
+     
+    steps:    
+    - uses: actions/checkout@v1
+    - name: Checkout submodules
+      uses: textbook/git-checkout-submodule-action@2.0.0
+    - name: Build project with CMAKE
+      uses: lpenz/ghaction-cmake@v0.1
+    - name: GH Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: |
+          DBImporter.exe
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}