diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index da435c52e..60806d9da 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -163,7 +163,7 @@ jobs:
         with:
           name: artifacts
           path: |
-            out/make/**/*universal.dmg
+            out/make/**/*.dmg
             out/make/**/*.AppImage
             windows_signing/**/*.exe
 
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 52803e218..ef93ac33a 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -166,7 +166,7 @@ jobs:
         with:
           name: artifacts
           path: |
-            out/make/**/*universal.dmg
+            out/make/**/*.dmg
             out/make/**/*.AppImage
             windows_signing/**/*.exe
 
diff --git a/.husky/prepare-commit-msg b/.husky/prepare-commit-msg
index 1cd763ff0..a9816d553 100755
--- a/.husky/prepare-commit-msg
+++ b/.husky/prepare-commit-msg
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-test -t 1 && exec < /dev/tty && npx cz --hook || true
\ No newline at end of file
+test -t 1 && exec < /dev/tty && npx cz -s --hook || true
\ No newline at end of file
diff --git a/package.json b/package.json
index 080ef9b17..838c1f244 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
   "main": ".webpack/main",
   "scripts": {
     "clean": "rm -rf dist && rm -rf out && rm -rf node_modules",
-    "start": "NODE_ENV=development electron-forge start",
-    "make-dev": "NODE_ENV=development electron-forge make --platform=darwin",
+    "start": "cross-env NODE_ENV=development electron-forge start",
+    "make-dev": "cross-env NODE_ENV=development electron-forge make --platform=darwin",
     "package": "electron-forge package",
     "make": "electron-forge make",
     "make-win": "electron-forge make --platform=win32",
@@ -22,7 +22,7 @@
     "prettier": "prettier --write \"./**/*.{js,json,css,scss,md}\"",
     "test": "vitest run src/renderer/tests src/main/tests",
     "e2e": "yarn playwright test",
-    "commit": "cz",
+    "commit": "cz -s",
     "prepare": "husky install"
   },
   "keywords": [
@@ -73,6 +73,7 @@
     "@vercel/webpack-asset-relocator-loader": "1.7.3",
     "babel-loader": "^9.1.2",
     "copy-webpack-plugin": "^11.0.0",
+    "cross-env": "^7.0.3",
     "css-loader": "^6.0.0",
     "cz-conventional-changelog": "^3.3.0",
     "electron": "^25.2.0",
diff --git a/yarn.lock b/yarn.lock
index 666cea8a4..bfb0cfe2f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4465,6 +4465,13 @@ create-require@^1.1.0:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
+cross-env@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
+  integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
+  dependencies:
+    cross-spawn "^7.0.1"
+
 cross-spawn-windows-exe@^1.1.0, cross-spawn-windows-exe@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/cross-spawn-windows-exe/-/cross-spawn-windows-exe-1.2.0.tgz#46253b0f497676e766faf4a7061004618b5ac5ec"