diff --git a/scripts/build-release.ts b/scripts/build-release.ts
index fbbafbb6b..e0a71e78f 100755
--- a/scripts/build-release.ts
+++ b/scripts/build-release.ts
@@ -67,7 +67,11 @@ async function buildDist(buildFolder: string) {
   const postBuildCallbacks: (() => void)[] = [];
 
   if (process.argv.indexOf('--mac') > -1) {
-    targetsRaw.push(Platform.MAC.createTarget(['dir', 'dmg']));
+    targetsRaw.push(Platform.MAC.createTarget(['dir']));
+    // You can build mac apps on Linux but can't build dmgs, so we separate those.
+    if (process.argv.indexOf('--mac-dmg') > -1) {
+      targetsRaw.push(Platform.MAC.createTarget(['dmg']));
+    }
     postBuildCallbacks.push(() =>
       spawn('zip', ['-qyr9', '../Flipper-mac.zip', 'Flipper.app'], {
         cwd: path.join(__dirname, '..', 'dist', 'mac'),
@@ -108,6 +112,9 @@ async function buildDist(buildFolder: string) {
         },
         electronDownload: electronDownloadOptions,
         npmRebuild: false,
+        win: {
+         signAndEditExecutable: false
+        }
       },
       projectDir: buildFolder,
       targets,