diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index 9f75fafbbc..5ac5702c29 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -60,7 +60,7 @@ jobs:
 
       - name: Build & publish
         # we want this to run only when on "push" to "master"
-        if: github.event_name == 'push' && github.ref == 'master'
+        if: github.ref == 'master' && github.event_name == 'push'
         uses: ./actions/build_publish
         with:
           MAC_CERTIFICATE: ${{ secrets.MAC_CERTIFICATE }}
diff --git a/actions/build_publish/action.yml b/actions/build_publish/action.yml
index 6ae1d83921..70dfc67100 100644
--- a/actions/build_publish/action.yml
+++ b/actions/build_publish/action.yml
@@ -7,12 +7,12 @@ runs:
   steps:
     - name: Build & publish windows production binaries
       shell: bash
-      if: runner.os == 'Windows' && github.ref == 'master' && github.event_name == 'push'
+      if: runner.os == 'Windows'
       run: $(yarn bin)/electron-builder --config.extraMetadata.environment=production --publish=always
 
     - name: Build & publish mac production binaries
       shell: bash
-      if: runner.os == 'macOS' && github.ref == 'master' && github.event_name == 'push'
+      if: runner.os == 'macOS'
       run: |
         source ./build/setup-mac-certificate.sh
         $(yarn bin)/electron-builder --config.extraMetadata.environment=production --config.mac.bundleVersion=${{ github.ref }} --publish=always
@@ -25,7 +25,7 @@ runs:
 
     - name: Build & publish linux production binaries
       shell: bash
-      if: runner.os == 'Linux' && github.ref == 'master' && github.event_name == 'push'
+      if: runner.os == 'Linux'
       run: |
         sudo apt-get install -y rpm
         yarn sedtoDeb; yarn build-release-publish && yarn sedtoAppImage && yarn build-release-publish && yarn sedtoDeb
diff --git a/package.json b/package.json
index af46c1c7c9..e9216e3669 100644
--- a/package.json
+++ b/package.json
@@ -285,8 +285,8 @@
     "files": [
       "package.json",
       "config/default.json",
-      "config/${env.production}.json",
-      "config/local-${env.production}.json",
+      "config/production.json",
+      "config/local-production.json",
       "background.html",
       "about.html",
       "password.html",