diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c15b66f..98420f55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
-## [Unreleased](#)
+## [2.1.0](https://github.com/Netflix-Skunkworks/stethoscope-app/tree/v2.1.0)
+
+### Fixed
+- upstream auto update issue ([electron issue](https://github.com/electron-userland/electron-builder/issues/3269))
+
+### Added
+- Thrift connection pooling
+- Support for AWS workstations
+- Scan duration to UI
+- Automated testing for builds
+
+----
 
 ## [2.0.6](https://github.com/Netflix-Skunkworks/stethoscope-app/tree/v2.0.6)
 
diff --git a/package.json b/package.json
index 9392cfa0..ffce484f 100644
--- a/package.json
+++ b/package.json
@@ -115,7 +115,7 @@
     "cors": "^2.8.4",
     "cross-env": "^5.2.0",
     "electron-settings": "^3.1.4",
-    "electron-updater": "^3.0.3",
+    "electron-updater": "3.0.3",
     "es6-promisify": "^6.0.0",
     "express": "^4.16.2",
     "generic-pool": "^3.4.2",
@@ -150,7 +150,7 @@
     "chai": "^4.1.2",
     "chai-http": "^4.0.0",
     "electron": "^2.0.6",
-    "electron-builder": "^20.28.4",
+    "electron-builder": "20.22.0",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "mocha": "^5.2.0",
diff --git a/public/release-notes.md b/public/release-notes.md
index cd6aad19..b611232f 100644
--- a/public/release-notes.md
+++ b/public/release-notes.md
@@ -1,21 +1,8 @@
-Changed:
-
-- Stethoscope is now a tray/menubar only application!
-- Normalized practice names to camelCase between `yaml` and `json`
-- Closing window collapses app to menubar/tray instead of quitting
-- Improved logging
-
-Added:
-
-- Automatic scanning (weekly scan by default) - controlled by `rescanIntervalSeconds` in [src/config.json](src/config.json)
-- Basic support for internationalization (practices.{LANGUAGE_CODE}.yaml)
-- Documentation around policies
-- New Mac device versions
-- Instructions now display dynamic content via handlebars preprocessing
-- Production debugging capabilities
-- Basic linux support (requires `root`)
-
 Fixed:
+- upstream auto update issue ([electron issue](https://github.com/electron-userland/electron-builder/issues/3269))
 
-- Improved thrift connection stability and removed magic numbers/timing
-- Windows not properly terminating osqueryd on close
+Added:
+- Thrift connection pooling
+- Support for AWS workstations
+- Scan duration to UI
+- Automated testing for builds
diff --git a/src/updater.js b/src/updater.js
index 316674cc..84425985 100644
--- a/src/updater.js
+++ b/src/updater.js
@@ -1,4 +1,4 @@
-const { dialog } = require('electron')
+const { dialog, app } = require('electron')
 const electronUpdater = require('electron-updater')
 
 let updater
@@ -30,13 +30,6 @@ module.exports = function (env, mainWindow, log = console, OSQuery, server) {
         attemptingUpdate = false
       }
     },
-    'before-quit-for-update': () => {
-      log.info('stopping osquery for app restart')
-      OSQuery.stop()
-      if (server && server.listening) {
-        server.close()
-      }
-    },
     'update-available': () => {
       dialog.showMessageBox({
         type: 'info',
@@ -78,6 +71,11 @@ module.exports = function (env, mainWindow, log = console, OSQuery, server) {
         message: 'Updates downloaded, Stethoscope will quit and relaunch.'
       }, () => {
         if (!isDev) {
+          OSQuery.stop()
+          if (server && server.listening) {
+            server.close()
+          }
+          // app.quit()
           setImmediate(() => autoUpdater.quitAndInstall())
         }
       })
@@ -86,7 +84,7 @@ module.exports = function (env, mainWindow, log = console, OSQuery, server) {
     'download-progress': (progressObj) => {
       mainWindow.webContents.send('download:progress', progressObj)
       // NOTE: uncomment to have download update progress displayed over app icon
-      mainWindow.setProgressBar(progressObj.percent / 100)
+      // mainWindow.setProgressBar(progressObj.percent / 100)
     }
   }