diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 656afde590..7fdc488730 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -143,6 +143,13 @@ jobs:
           path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-amd64.deb
           if-no-files-found: error
 
+      - name: Upload ARM64 .deb artifact
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.3
+        with:
+          name: Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.deb
+          path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.deb
+          if-no-files-found: error
+
       - name: Upload .rpm artifact
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.3
         with:
@@ -150,6 +157,13 @@ jobs:
           path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-x86_64.rpm
           if-no-files-found: error
 
+      - name: Upload ARM64 .rpm artifact
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.3
+        with:
+          name: Bitwarden-${{ env._PACKAGE_VERSION }}-aarch64.rpm
+          path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-aarch64.rpm
+          if-no-files-found: error
+
       - name: Upload .freebsd artifact
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.3
         with:
@@ -157,6 +171,13 @@ jobs:
           path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-x64.freebsd
           if-no-files-found: error
 
+      - name: Upload ARM64 .freebsd artifact
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.3
+        with:
+          name: Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.freebsd
+          path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.freebsd
+          if-no-files-found: error
+
       - name: Upload .snap artifact
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.3
         with:
@@ -171,6 +192,13 @@ jobs:
           path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-x86_64.AppImage
           if-no-files-found: error
 
+      - name: Upload ARM64 .AppImage artifact
+        uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.3
+        with:
+          name: Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.AppImage
+          path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.AppImage
+          if-no-files-found: error
+
       - name: Upload latest auto-update artifact
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.3
         with:
diff --git a/package.json b/package.json
index 574fefd5f4..03a7a387b0 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "clean:dist": "rimraf ./dist/*",
     "clean:l10n": "git push origin --delete l10n_master",
     "pack:dir": "npm run clean:dist && electron-builder --dir -p never",
-    "pack:lin": "npm run clean:dist && electron-builder --linux --x64 -p never",
+    "pack:lin": "npm run clean:dist && electron-builder --linux -p never",
     "pack:mac": "npm run clean:dist && electron-builder --mac --universal -p never",
     "pack:mac:arm64": "npm run clean:dist && electron-builder --mac --arm64 -p never",
     "pack:mac:mas": "npm run clean:dist && electron-builder --mac mas --universal -p never",
@@ -54,7 +54,7 @@
     "dist:mac:masdev": "npm run build && npm run pack:mac:masdev",
     "dist:win": "npm run build && npm run pack:win",
     "dist:win:ci": "npm run build && npm run pack:win:ci",
-    "publish:lin": "npm run build && npm run clean:dist && electron-builder --linux --x64 -p always",
+    "publish:lin": "npm run build && npm run clean:dist && electron-builder --linux -p always",
     "publish:mac": "npm run build && npm run clean:dist && electron-builder --mac -p always",
     "publish:mac:mas": "npm run dist:mac:mas && npm run upload:mas",
     "publish:win": "npm run build && npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p always -c.win.certificateSubjectName=\"8bit Solutions LLC\"",
@@ -142,11 +142,11 @@
       "category": "Utility",
       "synopsis": "A secure and free password manager for all of your devices.",
       "target": [
-        "deb",
-        "freebsd",
-        "rpm",
-        "AppImage",
-        "snap"
+	      { "target": "deb", "arch": [ "x64", "arm64" ]},
+	      { "target": "freebsd", "arch": [ "x64", "arm64" ]},
+	      { "target": "rpm", "arch": [ "x64", "arm64" ]},
+	      { "target": "AppImage", "arch": [ "x64", "arm64" ]},
+	      { "target": "snap", "arch": [ "x64" ]}
       ],
       "desktop": {
         "Name": "Bitwarden",