diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 04246b50..80a8706e 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -40,96 +40,89 @@ jobs:
       - name: Change Version
         run: sudo chmod +x resources/version.sh && ./resources/version.sh || true
 
-      - run: |
-          echo "test" > test.md
-          echo "test2" > test2.md
+      - name: Sign in to EVS
+        run: |
+          python3 -m pip install --upgrade castlabs-evs
+          python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }}
 
-#      - name: Sign in to EVS
-#        run: |
-#          python3 -m pip install --upgrade castlabs-evs
-#          python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }}
-#
-#      - name: Setup Environment
-#        run: brew install automake #libtool autoconf
-#
-#      - name: Install and Configure Node Modules
-#        run: |
-#          yarn install
-#          cp resources/verror-types node_modules/@types/verror/index.d.ts
-#          cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js
-#          rm -r node_modules/pouchdb-node/node_modules/leveldown
-#          rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown
-#
-#
-#      # Build the DMG
-#      - name: Build the DMG
-#        env:
-#          CSC_LINK: ${{ secrets.CSC_LINK }}
-#          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-#          APPLEID: ${{ secrets.APPLEID }}
-#          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
-#          APPLE_ID: ${{ secrets.APPLEID }}
-#          APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }}
-#          PSC_NAME: ${{ secrets.PSC_NAME }}
-#          DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
-#        run: yarn dist:universalNotWorking -p never
-#
-#      - name: Add license to DMG
-#        run: npx dmg-license resources/license.json dist/*.dmg
-#
-#      - name: Import
-#        uses: apple-actions/import-codesign-certs@v1
-#        with:
-#          p12-file-base64: ${{ secrets.CSC_LINK }}
-#          p12-password: ${{ secrets.CSC_KEY_PASSWORD }}
+      - name: Setup Environment
+        run: brew install automake #libtool autoconf
 
-      # Build to PKG
-#      - name: Build the PKG
-#        env:
-#          CSC_LINK: ${{ secrets.CSC_LINK }}
-#          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-#          APPLEID: ${{ secrets.APPLEID }}
-#          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
-#        run: |
-#          pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider-${{ env.APP_VERSION }}-universal.pkg --sign ${{ secrets.PSC_NAME }}
-#          xcrun altool --notarize-app --primary-bundle-id com.ciderapp.cider -f dist/Cider*.pkg  --username ${{ secrets.APPLEID }} --password ${{ secrets.APPLEIDPASS }}
-#          sleep 5m
-#          xcrun stapler staple dist/Cider*.pkg || true
+      - name: Install and Configure Node Modules
+        run: |
+          yarn install
+          cp resources/verror-types node_modules/@types/verror/index.d.ts
+          cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js
+          rm -r node_modules/pouchdb-node/node_modules/leveldown
+          rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown
 
-#      - name: Upload a Build Artifact
-#        uses: actions/upload-artifact@v2.2.3
-#        with:
-#          name: Cider-macOS-${{ env.APP_VERSION }}
-#          path: |
-#            dist/*.dmg
-#            dist/latest-mac.yml
+      - name: Build the DMG
+        env:
+          CSC_LINK: ${{ secrets.CSC_LINK }}
+          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          APPLEID: ${{ secrets.APPLEID }}
+          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+          APPLE_ID: ${{ secrets.APPLEID }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }}
+          PSC_NAME: ${{ secrets.PSC_NAME }}
+          DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+        run: yarn dist:universalNotWorking -p never
 
-      - name: Upload files to release
+      - name: Add license to DMG
+        run: npx dmg-license resources/license.json dist/*.dmg
+
+      - name: Upload DMG
         uses: svenstaro/upload-release-action@v2
         with:
           repo_name: ciderapp/cider-releases
-          # A personal access token for the GitHub repository in which the release will be created and edited.
-          # It is recommended to create the access token with the following scopes: `repo, user, admin:repo_hook`.
           repo_token: ${{ secrets.RELEASE_TOKEN }}
-          file: |
-            test.md
-            test2.md
+          file: dist/*.dmg
           tag: v${{ env.APP_VERSION }}
 
-#      - name: Upload Artifacts to Latest Release
-#        uses: softprops/action-gh-release@v1
-#        with:
-#          body: Full changelog available [here](https://github.com/ciderapp/Cider/compare/stable...main)
-#          files: |
-#            dist/*.dmg
-#            dist/latest-mac.yml
-#          name: Cider Version ${{ env.APP_VERSION }} (${{ env.GITHUB_REF_NAME }})
-#          tag_name: v${{ env.APP_VERSION }}
-#          repository: ciderapp/cider-releases
-#          token: ${{ secrets.RELEASE_TOKEN }}
-#        env:
-#          GITHUB_REPOSITORY: ciderapp/cider-releases
-#          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+      - name: Upload macOS Latest
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_name: ciderapp/cider-releases
+          repo_token: ${{ secrets.RELEASE_TOKEN }}
+          file: dist/latest-mac.yml
+          tag: v${{ env.APP_VERSION }}
+
+      - name: Import
+        uses: apple-actions/import-codesign-certs@v1
+        with:
+          p12-file-base64: ${{ secrets.CSC_LINK }}
+          p12-password: ${{ secrets.CSC_KEY_PASSWORD }}
+
+      - name: Build the PKG
+        env:
+          CSC_LINK: ${{ secrets.CSC_LINK }}
+          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          APPLEID: ${{ secrets.APPLEID }}
+          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+        run: |
+          pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider-${{ env.APP_VERSION }}-universal.pkg --sign ${{ secrets.PSC_NAME }}
+          xcrun altool --notarize-app --primary-bundle-id com.ciderapp.cider -f dist/Cider*.pkg  --username ${{ secrets.APPLEID }} --password ${{ secrets.APPLEIDPASS }}
+          sleep 5m
+          xcrun stapler staple dist/Cider*.pkg || true
+
+      - name: Upload PKG
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_name: ciderapp/cider-releases
+          repo_token: ${{ secrets.RELEASE_TOKEN }}
+          file: dist/*.pkg
+          tag: v${{ env.APP_VERSION }}
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v2.2.3
+        with:
+          name: Cider-macOS-${{ env.APP_VERSION }}
+          path: |
+            dist/*.dmg
+            dist/*.pkg
+            dist/latest-mac.yml
+
+