diff --git a/package.json b/package.json
index a96317204..8f31d5302 100755
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "build:ui:desktop:win": "docker-compose -f docker-compose-embedding.yml run build-desktop-production && yarn build:ui:desktop:app",
     "build:ui:desktop:production": "cd ui/desktop && yarn build:production",
     "build:ui:desktop:app": "cd ui/desktop && yarn build:desktop",
+    "build:ui:desktop:app:linux": "cd ui/desktop && yarn build:desktop:linux",
     "lint": "npm-run-all lint:*",
     "lint:addons-api": "cd addons/api && yarn lint",
     "lint:addons-auth": "cd addons/auth && yarn lint",
diff --git a/ui/desktop/README.md b/ui/desktop/README.md
index 82ef7d587..ef99c9b0d 100644
--- a/ui/desktop/README.md
+++ b/ui/desktop/README.md
@@ -76,6 +76,7 @@ These environment variables may be used to customized the build.
 | `APP_UPDATER_CURRENT_VERSION` | Version of client. |
 | `APP_UPDATER_LATEST_VERSION_TAG` | Next version for comparison with current version. |
 | `APP_UPDATER_LATEST_VERSION_LOCATION` | Location of app release to use for updating client. Can be a filepath or url. |
+| `BYPASS_CLI_SETUP` | Disable download and extraction of cli. For development use only. |
 
 ### Building for Production
 
diff --git a/ui/desktop/electron-app/config/desktop.js b/ui/desktop/electron-app/config/desktop.js
index 2f65b5c26..0e9748503 100644
--- a/ui/desktop/electron-app/config/desktop.js
+++ b/ui/desktop/electron-app/config/desktop.js
@@ -13,6 +13,7 @@ const createConfig = () => {
 
   if (process.env.CLI_LINUX_DEBIAN_SUPPORT) {
     config.name = 'boundary-desktop';
+    config.productName = 'boundary-desktop';
   }
 
   if (!config.releaseVersion) config.releaseVersion = '0.0.0';
diff --git a/ui/desktop/package.json b/ui/desktop/package.json
index 6c84b805d..d6eca93da 100755
--- a/ui/desktop/package.json
+++ b/ui/desktop/package.json
@@ -15,11 +15,9 @@
     "build:production": "cross-env EMBER_CLI_ELECTRON=true ember build --environment=production",
     "build:development": "ember build",
     "prebuild:desktop": "cross-os prebuild:desktop",
-    "build:desktop": "yarm build:desktop:mac",
+    "build:desktop": "yarn build:desktop:install && yarn --cwd electron-app make",
+    "build:desktop:linux": "yarn build:desktop:install && CLI_LINUX_DEBIAN_SUPPORT=true yarn --cwd electron-app make --platform linux --arch x64",
     "build:desktop:install": "yarn install --cwd electron-app",
-    "build:desktop:mac": "yarn build:desktop:install && yarn --cwd electron-app make",
-    "build:desktop:windows": "yarn build:desktop:install && yarn --cwd electron-app make",
-    "build:desktop:linux": "yarn build:desktop:install; CLI_LINUX_DEBIAN_SUPPORT=true yarn --cwd electron-app make --platform linux --arch x64",
     "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
     "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
     "lint:hbs": "ember-template-lint .",