diff --git a/.resinci.json b/.resinci.json
index 777756e2..68b5e16a 100644
--- a/.resinci.json
+++ b/.resinci.json
@@ -16,11 +16,67 @@
       "appId": "io.balena.etcher",
       "copyright": "Copyright 2016-2019 Balena Ltd",
       "productName": "balenaEtcher",
-      "nodeGypRebuild": false,
+      "nodeGypRebuild": true,
       "files": [
+        "!node_modules/**/*.js.map",
+        "!node_modules/**/*.h",
+        "!node_modules/**/*.hpp",
+        "!node_modules/**/*.cpp",
+        "!node_modules/**/*.md",
+        "!node_modules/**/*.ts",
+        "!node_modules/**/*.coffee",
+        "!node_modules/**/*.scss",
+        "!node_modules/**/*.less",
+        "!node_modules/**/*.hbs",
+        "!node_modules/**/*.mkd",
+        "!node_modules/**/LICENSE",
+        "!node_modules/**/LICENCE",
+        "!node_modules/**/license",
+        "!node_modules/**/License",
+        "!node_modules/**/LICENSE.txt",
+        "!node_modules/**/Makefile",
+        "!node_modules/**/.editorconfig",
+        "!node_modules/**/.babelrc",
+        "!node_modules/**/.prettierrc",
+        "!node_modules/**/.prettierrc-*",
+        "!node_modules/**/.eslintrc.yml",
+        "!node_modules/**/.eslintignore",
+        "!node_modules/**/.publishrc",
         "!lib/gui/app",
         "lib/gui/app/index.html",
-        "generated"
+        "generated",
+        "!node_modules/chart.js/dist/docs",
+        "!node_modules/ext2fs/config",
+        "!node_modules/ext2fs/deps",
+        "!node_modules/ext2fs/LICENSE",
+        "!node_modules/ext2fs/src",
+        "!node_modules/winusb-driver-generator/src",
+        "!node_modules/winusb-driver-generator/deps",
+        "!node_modules/winusb-driver-generator/ci",
+        "!node_modules/rendition/__screenshots__",
+        "!node_modules/polished/docs",
+        "!node_modules/mermaid/src",
+        "!node_modules/mermaid/dist",
+        "node_modules/mermaid/dist/mermaid.core.js",
+        "!node_modules/raven-js/src",
+        "!node_modules/raven-js/dist",
+        "node_modules/raven-js/dist/raven.js",
+        "!node_modules/raven-js/plugins",
+        "!node_modules/react-jsonschema-form/dist",
+        "!node_modules/xxhash/deps",
+        "!node_modules/xxhash/src",
+        "!node_modules/unzip-stream/testData*",
+        "!node_modules/usb",
+        "node_modules/usb/usb.js",
+        "node_modules/usb/package.json",
+        "node_modules/usb/build",
+        "node_modules/usb/src/binding",
+        "!node_modules/roboto-fontface/fonts",
+        "node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.woff",
+        "node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff",
+        "node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff",
+        "node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff",
+        "node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff"
       ],
       "mac": {
         "category": "public.app-category.developer-tools"
diff --git a/electron-builder.yml b/electron-builder.yml
index bb72fbe6..e7cbdfc6 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -1,8 +1,8 @@
 appId: io.balena.etcher
 copyright: Copyright 2016-2019 Balena Ltd
 productName: balenaEtcher
-npmRebuild: false
-nodeGypRebuild: false
+npmRebuild: true
+nodeGypRebuild: true
 publish: null
 files:
   - lib
@@ -37,9 +37,9 @@ nsis:
   uninstallerIcon: assets/icon.ico
   deleteAppDataOnUninstall: true
   license: LICENSE
-  artifactName: "${productName}-Setup-${version}-${env.TARGET_ARCH}.${ext}"
+  artifactName: "${productName}-Setup-${version}.${ext}"
 portable:
-  artifactName: "${productName}-Portable-${version}-${env.TARGET_ARCH}.${ext}"
+  artifactName: "${productName}-Portable-${version}.${ext}"
   requestExecutionLevel: user
 linux:
   category: Utility
diff --git a/scripts/resin b/scripts/resin
index 1a1e90b4..1b5bb595 160000
--- a/scripts/resin
+++ b/scripts/resin
@@ -1 +1 @@
-Subproject commit 1a1e90b427c4e6d5b8031f3092a66cd832dbbd07
+Subproject commit 1b5bb595fe00a81e9a12df654c9909e674997dd9