diff --git a/electron/build/entitlements.mac.plist b/electron/build/entitlements.mac.plist
deleted file mode 100644
index 5f2be1b9..00000000
--- a/electron/build/entitlements.mac.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-
-    <!-- Allow user to pick files to open/save -->
-    <key>com.apple.security.files.user-selected.read-write</key>
-    <true/>
-
-    <!-- Allow network client -->
-    <key>com.apple.security.network.client</key>
-    <true/>
-
-    <!-- Use hardware video decoder -->
-    <key>com.apple.security.cs.allow-jit</key>
-    <true/>
-
-    <!-- Allow outgoing network connections to download map tiles -->
-    <key>com.apple.security.network.server</key>
-    <true/>
-</dict>
-</plist>
diff --git a/electron/electron-builder.yml b/electron/electron-builder.yml
index 73f51122..4976917e 100644
--- a/electron/electron-builder.yml
+++ b/electron/electron-builder.yml
@@ -1,43 +1,57 @@
-appId: org.accessmod.desktop
 productName: AccessMod Desktop
+appId: org.accessmod.desktop
+asar: true
 directories:
   buildResources: build
 files:
-  - '!**/.vscode/*'
-  - '!src/*'
-  - '!electron.vite.config.{js,ts,mjs,cjs}'
-  - '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml}'
-  - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
-  
+  - out
+  - resources/**
 asarUnpack:
   - resources/**
 win:
+  publisherName: AccessMod Team
   executableName: AccessMod Desktop
   icon: build/icon.png
+  target:
+  - nsis
+  - zip
 nsis:
   artifactName: ${name}-${version}-setup.${ext}
   shortcutName: ${productName}
   uninstallDisplayName: ${productName}
   createDesktopShortcut: always
+  allowToChangeInstallationDirectory: true
+  oneClick: false
+  allowElevation: true
+  perMachine: true
 mac:
-  entitlementsInherit: build/entitlements.mac.plist
-  extendInfo:
-    - NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
-    - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
+  hardenedRuntime: true
+  gatekeeperAssess: false
+  mergeASARs: false
+  x64ArchFiles: "*"
+  minimumSystemVersion: 12.0.0
+  entitlements: resources/entitlements.mac.plist
+  entitlementsInherit: resources/entitlements.mac.plist
   notarize: false
   category: public.app-category.education  
-  type: development
   icon: build/icon.png
+  target: 
+    - dmg
+    - zip
 dmg:
   artifactName: ${name}-${version}.${ext}
+  sign : false
 linux:
   target:
     - AppImage
-    - snap
+    - zip
     - deb
+    - rpm
   maintainer: accessmod.org
   category: Utility
   icon: build/icon.png
+  synopsis: Wrapper for AccessMod Docker
+  description: Wrapper for AccesMod Docker instance and GUI helpers
 appImage:
   artifactName: ${name}-${version}.${ext}
 npmRebuild: false
diff --git a/electron/package.json b/electron/package.json
index 0ce7e716..7e169b6d 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -20,11 +20,10 @@
     "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
     "start": "electron-vite preview",
     "dev": "electron-vite --inspect-brk dev",
-    "build": "electron-vite build",
-    "build:unpack": "npm run build && electron-builder --dir",
-    "build:win": "npm run build && electron-builder --win",
-    "build:mac": "npm run build && electron-builder --mac",
-    "build:linux": "npm run build && electron-builder --linux"
+    "build": "yarn lint && electron-vite build",
+    "build:win": "yarn build && electron-builder --win",
+    "build:mac": "yarn build && electron-builder --mac",
+    "build:linux": "yarn build && electron-builder --linux"
   },
   "dependencies": {
     "@electron-toolkit/preload": "^3.0.0",
diff --git a/electron/resources/entitlements.mac.plist b/electron/resources/entitlements.mac.plist
new file mode 100644
index 00000000..4a603366
--- /dev/null
+++ b/electron/resources/entitlements.mac.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.automation.apple-events</key>
+    <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.debugger</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+    <key>com.apple.security.files.user-selected.read-write</key>
+    <true/>
+    <key>com.apple.security.inherit</key>
+    <true/>
+    <key>com.apple.security.network.client</key>
+    <true/>
+    <key>com.apple.security.network.server</key>
+    <true/>
+  </dict>
+</plist>