diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 4eecd31c4dc..fa3d0afeec0 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +1,2 @@
-github: develar
-issuehunt: electron-userland/electron-builder
 custom: https://www.electron.build/donate
+issuehunt: electron-userland/electron-builder
diff --git a/.idea/runConfigurations/build_snap_remote__template__production.xml b/.idea/runConfigurations/build_snap_remote__template__production.xml
new file mode 100644
index 00000000000..2916e751641
--- /dev/null
+++ b/.idea/runConfigurations/build_snap_remote__template__production.xml
@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="build snap remote (template) production" type="NodeJSConfigurationType" application-parameters="-i -t snap$ --testPathPattern=[/\\]{1}snapTest\.\w+$" path-to-js-file="node_modules/jest-cli/bin/jest.js" working-dir="$PROJECT_DIR$">
+    <envs>
+      <env name="TEST_APP_TMP_DIR" value="$PROJECT_DIR$/../../../ramdisk/electron-builder-test" />
+      <env name="DEBUG" value="electron-builder" />
+      <env name="_REMOTE_BUILD" value="true" />
+      <env name="BUILD_AGENT_HOST" value="service.electron.build" />
+    </envs>
+    <method v="2">
+      <option name="TypeScript.Before.Run" enabled="true" FAIL_ON_ERROR="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/package.json b/package.json
index 588d6a5eccb..03c8d46a6b6 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "@types/debug": "^4.1.4",
     "@types/is-ci": "^2.0.0",
     "@types/semver": "^6.0.0",
-    "app-builder-bin": "2.6.16",
+    "app-builder-bin": "2.6.17",
     "archiver": "^3.0.0",
     "async-exit-hook": "^2.0.1",
     "bluebird-lst": "^1.0.9",
diff --git a/packages/app-builder-lib/package.json b/packages/app-builder-lib/package.json
index 60b00e16587..10e92229950 100644
--- a/packages/app-builder-lib/package.json
+++ b/packages/app-builder-lib/package.json
@@ -42,7 +42,7 @@
   "homepage": "https://github.com/electron-userland/electron-builder",
   "dependencies": {
     "7zip-bin": "~4.1.0",
-    "app-builder-bin": "2.6.16",
+    "app-builder-bin": "2.6.17",
     "async-exit-hook": "^2.0.1",
     "bluebird-lst": "^1.0.9",
     "chromium-pickle-js": "^0.2.0",
diff --git a/packages/app-builder-lib/src/targets/snap.ts b/packages/app-builder-lib/src/targets/snap.ts
index ba183d01057..6398033260f 100644
--- a/packages/app-builder-lib/src/targets/snap.ts
+++ b/packages/app-builder-lib/src/targets/snap.ts
@@ -59,7 +59,6 @@ export default class SnapTarget extends Target {
 
     const appDescriptor: any = {
       command: "command.sh",
-      // command: "$SNAP/" + (this.isUseTemplateApp ? "" : "app/") + this.packager.executableName
       plugs: plugNames,
       adapter: "none",
     }
diff --git a/packages/builder-util/package.json b/packages/builder-util/package.json
index e3371062549..684e803bd38 100644
--- a/packages/builder-util/package.json
+++ b/packages/builder-util/package.json
@@ -11,7 +11,7 @@
     "out"
   ],
   "dependencies": {
-    "app-builder-bin": "2.6.16",
+    "app-builder-bin": "2.6.17",
     "temp-file": "^3.3.3",
     "fs-extra-p": "^8.0.2",
     "is-ci": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index 13f79d77320..bec727f05fa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1362,10 +1362,10 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-app-builder-bin@2.6.16:
-  version "2.6.16"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.16.tgz#5b27f74e52112cfefb10a841d222812af9599ec8"
-  integrity sha512-TSq2/AwXbFI+jK4SPRRASZEpZ32HsrugxuCzHshnZ3Wj5LDVIAMU3EGXfaciXWx7TV047G69RlA4/Y8OiHBn3w==
+app-builder-bin@2.6.17:
+  version "2.6.17"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.17.tgz#636b7645bedeba7ed12e930591de5444ed5b1360"
+  integrity sha512-/nzacJvyB484CR3cAB0LiZVPhl3PSzD6S5BsJXBlQuBmiilj/qW4kklv+GEJQ2C0qPAifzEiCbR8+L/+5Eby8A==
 
 aproba@^1.0.3:
   version "1.2.0"