diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef8a582..0de552e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,5 +11,4 @@ build:
         paths:
             - $CI_PROJECT_DIR/dist/*.*
         script:
-            - sed "s/0.0.0/${VERSION_ID}/g" package.json > _package.json && mv _package.json package.json
-            - yarn && yarn electron:build
+            - yarn dist
diff --git a/electron.builder.yml b/electron.builder.yml
new file mode 100644
index 0000000..2590695
--- /dev/null
+++ b/electron.builder.yml
@@ -0,0 +1,51 @@
+electronVersion: 9.0.0
+compression: normal
+npmRebuild: false
+# TODO: enable this in the future once we sign all the linux builds.
+#forceCodeSigning: true
+directories:
+  output: dist
+  buildResources: build
+  app: .
+
+mac:
+  category: Reference
+  icon: ./icons/icon.icns
+  target:
+    - target: dmg
+    - target: zip
+
+  # steps for notarizing the MacOS builds:
+  # https://kilianvalkhof.com/2019/electron/notarizing-your-electron-application/
+
+  hardenedRuntime: true
+  gatekeeperAssess: false
+  entitlements: build/macos/entitlements.mac.plist
+  entitlementsInherit: build/macos/entitlements.mac.plist
+
+dmg:
+  # The inner app inside the .dmg is signed and there is some broken logic
+  # which requires that the DMG itself is not signed.
+  sign: false
+
+
+nsis:
+  artifactName: ${name}-${version}-${arch}.${ext}
+
+appx:
+  artifactName: ${name}-${version}-${arch}.${ext}
+  applicationId: polar
+  identityName: 25130KevinBurton.PolarBookshelf
+  publisher: CN=D3591277-F57D-4C75-B342-D158E6C4AAF5
+  publisherDisplayName: Kevin Burton
+
+
+# https://www.electron.build/configuration/publish
+# https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/
+publish:
+  provider: github
+  publishAutoUpdate: true
+
+asar: true
+afterPack: "./electron-builder-afterpack.js"
+afterSign: "./build/macos/notarize.js"
diff --git a/package.json b/package.json
index 7117a2c..587010a 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "author": {
     "name": "Enrique Hernandez"
   },
-  "main": "background.js",
+  "main": "./src/background.ts",
   "scripts": {
     "dev": "yarn electron:serve",
     "serve": "vue-cli-service serve",
@@ -17,7 +17,8 @@
     "electron:build": "vue-cli-service electron:build",
     "electron:serve": "vue-cli-service electron:serve",
     "postinstall": "electron-builder install-app-deps",
-    "postuninstal": "electron-builder install-app-deps"
+    "postuninstal": "electron-builder install-app-deps",
+    "dist":"electron-builder --publish always"
   },
   "dependencies": {
     "@google-cloud/speech": "^4.2.0",
diff --git a/src/App.vue b/src/App.vue
index a8247ea..320b62f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,19 +6,19 @@
 
     <!-- Minimize and exit buttons. -->
     <span class="menu">
-      <button 
-        class="menuButton exitButton" 
-        @click.prevent="post('nav-bar', 'close')" 
+      <button
+        class="menuButton exitButton"
+        @click.prevent="post('nav-bar', 'close')"
       />
-      <button 
-        class="menuButton minimizeButton" 
-        @click.prevent="post('nav-bar', 'min')" 
+      <button
+        class="menuButton minimizeButton"
+        @click.prevent="post('nav-bar', 'min')"
       />
     </span>
 
     <!-- Main Pages -->
-    <Messenger 
-      v-if="profile" 
+    <Messenger
+      v-if="profile"
       :profile="profile"
       :newMessages="newMessages"
     />
@@ -28,7 +28,7 @@
 
   <!-- Show spash screen if ready is false -->
   <Splash v-else />
-  
+
 </template>
 
 <script lang="ts">
@@ -41,7 +41,7 @@ import Messenger from "@/components/messenger.vue";
 import Login from "@/components/login.vue";
 
 export default defineComponent({
-  components: { 
+  components: {
     Splash,
     Messenger,
     Login
@@ -82,6 +82,13 @@ export default defineComponent({
     onMounted(() => {
       console.log("APP:mounted.")
       window.ipcRenderer.on("update-state", updateState)
+      window.ipcRenderer.on("update_available", () => {
+          console.log('testing auto update');
+      })
+
+      window.ipcRenderer.on("update_downloaded", () => {
+          console.log('testing update download');
+      })
       post("app-mounted", "")
     });
 
diff --git a/src/background/init.ts b/src/background/init.ts
index f9c8e86..52e184a 100644
--- a/src/background/init.ts
+++ b/src/background/init.ts
@@ -4,8 +4,9 @@
 import { app } from "electron";
 import { createWindow } from './window';
 import { initSession } from './session';
-import { initAudioIO, stopStream } from './audio';
+import { initAudioIO } from './audio';
 import { backgroundMitt } from '@/modules/emitter';
+const { autoUpdater } = require('electron-updater');
 
 let win: boolean;
 
diff --git a/src/background/window.ts b/src/background/window.ts
index b344e80..e312572 100644
--- a/src/background/window.ts
+++ b/src/background/window.ts
@@ -6,6 +6,7 @@ import { backgroundMitt } from '@/modules/emitter';
 import { RenderMessage, WindowState } from "@/types";
 import { loadWinState, saveToJson } from "./helpers";
 import * as path from "path";
+const { autoUpdater } = require('electron-updater');
 
 interface IpcRendererPayload {
   endpoint: string;
@@ -64,7 +65,7 @@ const onWindowMount = (): void => {
     // Handle win nav-bar event.
     ipcMain.removeAllListeners("nav-bar") // avoid setting duplicate handlers
     ipcMain.on("nav-bar", onNavBar);
-    
+
     // Gateway for messages to the frontend.
     backgroundMitt.removeAllListeners("ipc-renderer")
     backgroundMitt.on("ipc-renderer", renderMessage);
@@ -109,7 +110,7 @@ export async function createWindow(): Promise<void> {
     // Load the URL.
     if (process.env.WEBPACK_DEV_SERVER_URL) {
       win.loadURL(process.env.WEBPACK_DEV_SERVER_URL as string); // dev
-    } 
+    }
 
     else {
       createProtocol("app");
@@ -124,6 +125,7 @@ export async function createWindow(): Promise<void> {
     win.on("resize", saveWindowState);
 
     win.once('ready-to-show', () => {
+    autoUpdater.checkForUpdatesAndNotify();
       if (win) win.show()
     })
 
@@ -139,3 +141,11 @@ export async function createWindow(): Promise<void> {
 
   });
 }
+
+autoUpdater.on('update-available', () => {
+  if (win) win.webContents.send('update_available');
+});
+
+autoUpdater.on('update-downloaded', () => {
+  if (win) win.webContents.send('update_downloaded');
+});