diff --git a/.changeset/dirty-clocks-rhyme.md b/.changeset/dirty-clocks-rhyme.md
new file mode 100644
index 00000000000..236146a5d84
--- /dev/null
+++ b/.changeset/dirty-clocks-rhyme.md
@@ -0,0 +1,6 @@
+---
+"app-builder-lib": patch
+"dmg-builder": patch
+---
+
+fix: pass in platform to electron-rebuild
diff --git a/packages/app-builder-lib/package.json b/packages/app-builder-lib/package.json
index e81f4c7d41e..0c4ef3028f8 100644
--- a/packages/app-builder-lib/package.json
+++ b/packages/app-builder-lib/package.json
@@ -49,7 +49,7 @@
     "@develar/schema-utils": "~2.6.5",
     "@electron/notarize": "2.5.0",
     "@electron/osx-sign": "1.3.1",
-    "@electron/rebuild": "3.6.0",
+    "@electron/rebuild": "3.6.1",
     "@electron/universal": "2.0.1",
     "@malept/flatpak-bundler": "^0.4.0",
     "@types/fs-extra": "9.0.13",
diff --git a/packages/app-builder-lib/src/codeSign/windowsSignToolManager.ts b/packages/app-builder-lib/src/codeSign/windowsSignToolManager.ts
index d81ac53b138..32b5f5a3da2 100644
--- a/packages/app-builder-lib/src/codeSign/windowsSignToolManager.ts
+++ b/packages/app-builder-lib/src/codeSign/windowsSignToolManager.ts
@@ -200,7 +200,7 @@ export class WindowsSignToolManager {
       }
       log.info(logInfo, "signing")
     } else if (!customSign) {
-      log.error({ signHook: customSign, cscInfo }, "no signing info identified, signing is skipped")
+      log.warn({ signHook: !!customSign, cscInfo }, "no signing info identified, signing is skipped")
       return false
     }
 
diff --git a/packages/app-builder-lib/src/util/yarn.ts b/packages/app-builder-lib/src/util/yarn.ts
index 0f6016deb97..3f7b9536da6 100644
--- a/packages/app-builder-lib/src/util/yarn.ts
+++ b/packages/app-builder-lib/src/util/yarn.ts
@@ -182,15 +182,16 @@ export async function rebuild(config: Configuration, appDir: string, options: Re
     execPath: process.env.npm_execpath || process.env.NPM_CLI_JS,
     buildFromSource: options.buildFromSource === true,
   }
+  const { arch, buildFromSource, platform } = configuration
+
   if (config.nativeRebuilder === "legacy") {
-    const env = getGypEnv(options.frameworkInfo, configuration.platform, configuration.arch, options.buildFromSource === true)
+    const env = getGypEnv(options.frameworkInfo, platform, arch, buildFromSource)
     return executeAppBuilderAndWriteJson(["rebuild-node-modules"], configuration, { env, cwd: appDir })
   }
 
   const {
     frameworkInfo: { version: electronVersion },
   } = options
-  const { arch, buildFromSource } = configuration
   const logInfo = {
     electronVersion,
     arch,
@@ -203,9 +204,10 @@ export async function rebuild(config: Configuration, appDir: string, options: Re
     buildPath: appDir,
     electronVersion,
     arch,
+    platform,
+    buildFromSource,
     projectRootPath: await getProjectRootPath(appDir),
     mode: (config.nativeRebuilder as RebuildMode) || "sequential",
-    buildFromSource: buildFromSource,
     disablePreGypCopy: true,
   }
   return remoteRebuild(rebuildOptions)
diff --git a/packages/dmg-builder/src/hdiuil.ts b/packages/dmg-builder/src/hdiuil.ts
index 74bf0b2828c..79c6356632f 100644
--- a/packages/dmg-builder/src/hdiuil.ts
+++ b/packages/dmg-builder/src/hdiuil.ts
@@ -4,7 +4,7 @@ export async function hdiUtil(args: string[]) {
   return retry(
     () => exec("hdiutil", args),
     5,
-    1000,
+    5000,
     2000,
     0,
     (error: any) => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e5ffc18eafb..c26db1a981f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -90,8 +90,8 @@ importers:
         specifier: 1.3.1
         version: 1.3.1
       '@electron/rebuild':
-        specifier: 3.6.0
-        version: 3.6.0
+        specifier: 3.6.1
+        version: 3.6.1
       '@electron/universal':
         specifier: 2.0.1
         version: 2.0.1
@@ -2013,8 +2013,8 @@ packages:
     engines: {node: '>=12.0.0'}
     hasBin: true
 
-  '@electron/rebuild@3.6.0':
-    resolution: {integrity: sha512-zF4x3QupRU3uNGaP5X1wjpmcjfw1H87kyqZ00Tc3HvriV+4gmOGuvQjGNkrJuXdsApssdNyVwLsy+TaeTGGcVw==}
+  '@electron/rebuild@3.6.1':
+    resolution: {integrity: sha512-f6596ZHpEq/YskUd8emYvOUne89ij8mQgjYFA5ru25QwbrRO+t1SImofdDv7kKOuWCmVOuU5tvfkbgGxIl3E/w==}
     engines: {node: '>=12.13.0'}
     hasBin: true
 
@@ -8247,11 +8247,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@electron/rebuild@3.6.0':
+  '@electron/rebuild@3.6.1':
     dependencies:
       '@malept/cross-spawn-promise': 2.0.0
       chalk: 4.1.2
-      debug: 4.3.4
+      debug: 4.3.7
       detect-libc: 2.0.2
       fs-extra: 10.1.0
       got: 11.8.6
@@ -8260,7 +8260,7 @@ snapshots:
       node-gyp: 9.4.1
       ora: 5.4.1
       read-binary-file-arch: 1.0.6
-      semver: 7.6.0
+      semver: 7.6.3
       tar: 6.2.1
       yargs: 17.7.2
     transitivePeerDependencies:
@@ -9071,7 +9071,7 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.3.5
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -10721,7 +10721,7 @@ snapshots:
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.3.5
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -10740,7 +10740,7 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.5
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -12291,7 +12291,7 @@ snapshots:
 
   read-binary-file-arch@1.0.6:
     dependencies:
-      debug: 4.3.5
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -12616,7 +12616,7 @@ snapshots:
   socks-proxy-agent@7.0.0:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.5
+      debug: 4.3.7
       socks: 2.8.1
     transitivePeerDependencies:
       - supports-color