diff --git a/.github/workflows/build-app.yaml b/.github/workflows/build-app.yaml
index 2a01dfff4..46f20b092 100644
--- a/.github/workflows/build-app.yaml
+++ b/.github/workflows/build-app.yaml
@@ -42,39 +42,52 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }} # token for electron publish
 
-      - name: Copy artifacts Linux, MacOs
-        if: matrix.os != 'windows-2016'
+      - name: Copy artifacts
         run: |
-          mkdir artifacts
+          mkdir artifacts          
 
-          cp app/dist/*.AppImage artifacts/ || true
-          cp app/dist/*.dmg artifacts/ || true
-          cp app/dist/*.deb artifacts/ || true
-
-          mv app/dist/*.deb artifacts/dbgate-linux.deb || true
-          mv app/dist/*.AppImage artifacts/dbgate-linux.AppImage || true
-          mv app/dist/*.dmg artifacts/dbgate-mac.dmg || true
-          
-      - name: Copy artifacts Win
-        if: matrix.os == 'windows-2016'
-        run: |
-          mkdir artifacts
-
-          cp app/dist/*.exe artifacts/ || true          
-
-          mv app/dist/*.exe artifacts/dbgate-windows.exe
+          mv app/dist/*.exe artifacts/ || true
+          mv app/dist/*.AppImage artifacts/ || true
+          mv app/dist/*.deb artifacts/ || true
+          mv app/dist/*.dmg artifacts/ || true
 
           mv app/dist/latest.yml artifacts/latest.yml || true
-
-      - name: Copy latest-linux.yml
-        if: matrix.os == 'ubuntu-18.04'
-        run: |
           mv app/dist/latest-linux.yml artifacts/latest-linux.yml || true
-
-      - name: Copy latest-mac.yml
-        if: matrix.os == 'macOS-10.14'
-        run: |
           mv app/dist/latest-mac.yml artifacts/latest-mac.yml || true
+
+      # - name: Copy artifacts Linux, MacOs
+      #   if: matrix.os != 'windows-2016'
+      #   run: |
+      #     mkdir artifacts
+
+      #     cp app/dist/*.AppImage artifacts/ || true
+      #     cp app/dist/*.dmg artifacts/ || true
+      #     cp app/dist/*.deb artifacts/ || true
+
+      #     mv app/dist/*.deb artifacts/dbgate-linux.deb || true
+      #     mv app/dist/*.AppImage artifacts/dbgate-linux.AppImage || true
+      #     mv app/dist/*.dmg artifacts/dbgate-mac.dmg || true
+          
+      # - name: Copy artifacts Win
+      #   if: matrix.os == 'windows-2016'
+      #   run: |
+      #     mkdir artifacts
+
+      #     cp app/dist/*.exe artifacts/ || true          
+
+      #     mv app/dist/*.exe artifacts/dbgate-windows.exe
+
+      #     mv app/dist/latest.yml artifacts/latest.yml || true
+
+      # - name: Copy latest-linux.yml
+      #   if: matrix.os == 'ubuntu-18.04'
+      #   run: |
+      #     mv app/dist/latest-linux.yml artifacts/latest-linux.yml || true
+
+      # - name: Copy latest-mac.yml
+      #   if: matrix.os == 'macOS-10.14'
+      #   run: |
+      #     mv app/dist/latest-mac.yml artifacts/latest-mac.yml || true
           
       - name: Upload artifacts
         uses: actions/upload-artifact@v1
diff --git a/app/package.json b/app/package.json
index ff3020c99..b2bf303c3 100644
--- a/app/package.json
+++ b/app/package.json
@@ -17,6 +17,7 @@
     "mac": {
       "category": "database",
       "icon": "icon512.png",
+      "artifactName": "dbgate-mac-${version}.${ext}",
       "publish": [
         "github"
       ]
@@ -27,6 +28,7 @@
         "deb"
       ],
       "icon": "icon.png",
+      "artifactName": "dbgate-linux-${version}.${ext}",
       "category": "Development",
       "synopsis": "Database administration tool for MS SQL, MySQL and PostgreSQL",
       "publish": [
@@ -37,6 +39,7 @@
       "target": [
         "nsis"
       ],
+      "artifactName": "dbgate-windows-${version}.${ext}",
       "icon": "icon.ico",
       "publish": [
         "github"