diff --git a/src/dedupe.coffee b/src/dedupe.coffee
index 83cfadead..d4a9e722e 100644
--- a/src/dedupe.coffee
+++ b/src/dedupe.coffee
@@ -33,9 +33,10 @@ class Dedupe extends Command
 
   installNode: (callback) ->
     installNodeArgs = ['install']
+    installNodeArgs.push("--runtime=electron")
     installNodeArgs.push("--target=#{@electronVersion}")
     installNodeArgs.push("--dist-url=#{config.getElectronUrl()}")
-    installNodeArgs.push('--arch=ia32')
+    installNodeArgs.push("--arch=#{config.getElectronArch()}")
     installNodeArgs.push('--ensure')
 
     env = _.extend({}, process.env, HOME: @atomNodeDirectory)
@@ -71,8 +72,9 @@ class Dedupe extends Command
 
   forkDedupeCommand: (options, callback) ->
     dedupeArgs = ['--globalconfig', config.getGlobalConfigPath(), '--userconfig', config.getUserConfigPath(), 'dedupe']
+    dedupeArgs.push("--runtime=electron")
     dedupeArgs.push("--target=#{@electronVersion}")
-    dedupeArgs.push('--arch=ia32')
+    dedupeArgs.push("--arch=#{config.getElectronArch()}")
     dedupeArgs.push('--silent') if options.argv.silent
     dedupeArgs.push('--quiet') if options.argv.quiet
 
diff --git a/src/install.coffee b/src/install.coffee
index 19c423960..ef5bff442 100644
--- a/src/install.coffee
+++ b/src/install.coffee
@@ -60,6 +60,7 @@ class Install extends Command
 
   installNode: (callback) =>
     installNodeArgs = ['install']
+    installNodeArgs.push("--runtime=electron")
     installNodeArgs.push("--target=#{@electronVersion}")
     installNodeArgs.push("--dist-url=#{config.getElectronUrl()}")
     installNodeArgs.push("--arch=#{config.getElectronArch()}")
@@ -95,6 +96,7 @@ class Install extends Command
 
     installArgs = ['--globalconfig', config.getGlobalConfigPath(), '--userconfig', config.getUserConfigPath(), 'install']
     installArgs.push(modulePath)
+    installArgs.push("--runtime=electron")
     installArgs.push("--target=#{@electronVersion}")
     installArgs.push("--arch=#{config.getElectronArch()}")
     installArgs.push("--global-style") if installGlobally
@@ -189,6 +191,7 @@ class Install extends Command
 
   forkInstallCommand: (options, callback) ->
     installArgs = ['--globalconfig', config.getGlobalConfigPath(), '--userconfig', config.getUserConfigPath(), 'install']
+    installArgs.push("--runtime=electron")
     installArgs.push("--target=#{@electronVersion}")
     installArgs.push("--arch=#{config.getElectronArch()}")
     installArgs.push('--silent') if options.argv.silent
@@ -418,6 +421,7 @@ class Install extends Command
 
       buildArgs = ['--globalconfig', config.getGlobalConfigPath(), '--userconfig', config.getUserConfigPath(), 'build']
       buildArgs.push(path.resolve(__dirname, '..', 'native-module'))
+      buildArgs.push("--runtime=electron")
       buildArgs.push("--target=#{@electronVersion}")
       buildArgs.push("--arch=#{config.getElectronArch()}")
 
diff --git a/src/rebuild.coffee b/src/rebuild.coffee
index e648a72d0..e3c17be0b 100644
--- a/src/rebuild.coffee
+++ b/src/rebuild.coffee
@@ -43,6 +43,7 @@ class Rebuild extends Command
       '--userconfig'
       config.getUserConfigPath()
       'rebuild'
+      '--runtime=electron'
       "--target=#{@electronVersion}"
       "--arch=#{config.getElectronArch()}"
     ]