2 files changed, 40 insertions, 32 deletions

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 46ca020fa..610826872 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -166,7 +166,7 @@ jobs:
         shell: bash
       - name: Build Ferdium with publish for 'nightly' branch
         if: ${{ env.GIT_BRANCH_NAME == 'nightly' }}
-        run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }}
+        run: npm run build -- --publish always
         shell: bash
         env:
           GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }}
@@ -178,7 +178,7 @@ jobs:
           # CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
       - name: Build Ferdium with publish for 'release' branch
         if: ${{ env.GIT_BRANCH_NAME == 'release' }}
-        run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }}
+        run: npm run build -- --publish always
         shell: bash
         env:
           GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }}
@@ -263,7 +263,7 @@ jobs:
         run: |
           sudo snap install snapcraft --classic
           echo "$SNAPCRAFT_LOGIN" | snapcraft login --with -
-          npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.snap.publish.provider=snapStore -c.snap.publish.repo=nightlies -c.snap.publish.channels=edge
+          npm run build -- --publish always -c.snap.publish.repo=nightlies -c.snap.publish.channels=edge
           snapcraft logout
         shell: bash
       - name: Build Ferdium with publish for 'release' beta branch
@@ -275,7 +275,7 @@ jobs:
         run: |
           sudo snap install snapcraft --classic
           echo "$SNAPCRAFT_LOGIN" | snapcraft login --with -
-          npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.snap.publish.provider=snapStore -c.snap.publish.repo=ferdium -c.snap.publish.channels=beta
+          npm run build -- --publish always -c.snap.publish.repo=ferdium -c.snap.publish.channels=beta
           snapcraft logout
         shell: bash
       - name: Build Ferdium with publish for 'release' stable branch
@@ -287,7 +287,7 @@ jobs:
         run: |
           sudo snap install snapcraft --classic
           echo "$SNAPCRAFT_LOGIN" | snapcraft login --with -
-          npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.snap.publish.provider=snapStore -c.snap.publish.repo=ferdium -c.snap.publish.channels=stable
+          npm run build -- --publish always -c.snap.publish.repo=ferdium -c.snap.publish.channels=stable
           snapcraft logout
         shell: bash
 
@@ -364,7 +364,7 @@ jobs:
         shell: bash
       - name: Build Ferdium with publish for 'nightly' branch
         if: ${{ env.GIT_BRANCH_NAME == 'nightly' }}
-        run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }}
+        run: npm run build -- --publish always
         shell: bash
         env:
           GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }}
@@ -374,7 +374,7 @@ jobs:
           # WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
       - name: Build Ferdium with publish for 'release' branch
         if: ${{ env.GIT_BRANCH_NAME == 'release' }}
-        run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }}
+        run: npm run build -- --publish always
         shell: bash
         env:
           GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }}
diff --git a/electron-builder.yml b/electron-builder.yml
index ebe16b29c..6c42fc3ea 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -4,6 +4,39 @@ directories:
 
 appId: "org.ferdium.ferdium-app"
 
+publish:
+  provider: github
+  owner: ${ github.repository_owner }
+
+snap:
+  publish:
+    provider: snapStore
+
+nsis:
+  perMachine: false
+  oneClick: true
+
+dmg:
+  background: ./build-helpers/images/dmgInstaller.tiff
+  icon: ./build-helpers/images/icon.icns
+  iconSize: 128
+  contents:
+    [
+      { x: 380, y: 240, type: link, path: /Applications },
+      { x: 122, y: 240, type: file },
+    ]
+
+afterSign: ./build-helpers/notarize.js
+
+protocols:
+  name: Ferdium
+  schemes: [ferdium]
+
+asarUnpack:
+  - ./recipes
+  - ./assets/fonts
+  - ./assets/images/taskbar
+
 mac:
   hardenedRuntime: true
   gatekeeperAssess: false
@@ -21,18 +54,6 @@ mac:
     NSCameraUsageDescription: "This app requires camera access for video chats"
     NSMicrophoneUsageDescription: "This app requires microphone access for voice chats"
 
-dmg:
-  background: ./build-helpers/images/dmgInstaller.tiff
-  icon: ./build-helpers/images/icon.icns
-  iconSize: 128
-  contents:
-    [
-      { x: 380, y: 240, type: link, path: /Applications },
-      { x: 122, y: 240, type: file },
-    ]
-
-afterSign: ./build-helpers/notarize.js
-
 win:
   icon: ./build-helpers/images/icon.ico
   target:
@@ -58,16 +79,3 @@ linux:
     - target: rpm
     - target: freebsd
     - target: snap
-
-nsis:
-  perMachine: false
-  oneClick: true
-
-protocols:
-  name: Ferdium
-  schemes: [ferdium]
-
-asarUnpack:
-  - ./recipes
-  - ./assets/fonts
-  - ./assets/images/taskbar