diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 29555f34..b2653437 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -52,7 +52,7 @@ jobs:
 
     - name: Build and sign packages
       run: scripts/build-macos.js
-      if: github.repository == 'Eugeny/terminus' && github.event_name == 'push' && github.ref == 'refs/heads/master'
+      if: github.repository == 'Eugeny/terminus' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags'))
       env:
         ARCH: ${{matrix.arch}}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -65,7 +65,7 @@ jobs:
 
     - name: Build packages without signing
       run: scripts/build-macos.js
-      if: github.repository != 'Eugeny/terminus' || github.event_name != 'push' || github.ref != 'refs/heads/master'
+      if: "! (github.repository == 'Eugeny/terminus' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')))"
       env:
         ARCH: ${{matrix.arch}}
         # DEBUG: electron-builder,electron-builder:*
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index ce7e6052..fce0b0f3 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -26,7 +26,7 @@ jobs:
 
     - name: Build and sign packages
       run: node scripts/build-windows.js
-      if: github.repository == 'Eugeny/terminus' && github.event_name == 'push' && github.ref == 'refs/heads/master'
+      if: github.repository == 'Eugeny/terminus' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags'))
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
@@ -35,7 +35,7 @@ jobs:
 
     - name: Build packages without signing
       run: node scripts/build-windows.js
-      if: github.repository != 'Eugeny/terminus' || github.event_name != 'push' || github.ref != 'refs/heads/master'
+      if: "!(github.repository == 'Eugeny/terminus' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')))"
 
     - name: Upload symbols
       run: |