diff --git a/.github/workflows/studio-publish.yml b/.github/workflows/studio-publish.yml
index 7ca4061b1..551852a2f 100644
--- a/.github/workflows/studio-publish.yml
+++ b/.github/workflows/studio-publish.yml
@@ -122,7 +122,7 @@ jobs:
         run: bash ./.github/scripts/install-build-deps.sh
 
       - name: Install azuresigntool
-        run: 'dotnet tool install --global AzureSignTool --version 6.0.1'
+        run: 'dotnet tool install --global AzureSignTool --version 7.0.1'
         if: matrix.os.type == 'windows'
 
       - name: Azure Login
diff --git a/apps/studio/electron-builder-config.js b/apps/studio/electron-builder-config.js
index 1eb531e76..8b23286b7 100644
--- a/apps/studio/electron-builder-config.js
+++ b/apps/studio/electron-builder-config.js
@@ -1,3 +1,4 @@
+const path = require('path')
 
 const fpmOptions = [
   "--after-install=build/deb-postinstall"
@@ -10,6 +11,8 @@ const rpmFpmOptions = [
 // FIXME: Get a new certificate with a subject line that is a valid AppX publisher
 // support request open to digicert currently (Feb 2025)
 const certSubject = 'SERIALNUMBER=803010247, C=US, ST=Texas, L=Dallas, O="Rathbone Labs, LLC", CN="Rathbone Labs, LLC"'
+const bksAiShellPath = path.dirname(require.resolve('@beekeeperstudio/bks-ai-shell/package.json'));
+const bksErDiagramPath = path.dirname(require.resolve('@beekeeperstudio/bks-er-diagram/package.json'));
 
 
 
@@ -35,11 +38,11 @@ module.exports = {
   ],
   extraResources: [
     {
-      from: "node_modules/@beekeeperstudio/bks-ai-shell",
+      from: bksAiShellPath,
       to: "bundled_plugins/@beekeeperstudio/bks-ai-shell"
     },
     {
-      from: "node_modules/@beekeeperstudio/bks-er-diagram",
+      from: bksErDiagramPath,
       to: "bundled_plugins/@beekeeperstudio/bks-er-diagram"
     },
     {