diff --git a/desktop/forge.config.cjs b/desktop/forge.config.cjs
index 9c2524b3a..36157e0fa 100644
--- a/desktop/forge.config.cjs
+++ b/desktop/forge.config.cjs
@@ -1,130 +1,132 @@
 const babel = require('@babel/core');
 const { PluginBase } = require('@electron-forge/plugin-base');
 const fs = require('fs-extra');
 const klaw = require('klaw');
 const path = require('path');
 
 const transformDirectoryWithBabel = async (dirPath, outDirPath) => {
   for await (const { path: filePath, stats } of klaw(dirPath)) {
     if (stats.isFile()) {
       const outPath = path.resolve(
         outDirPath,
         path.relative(dirPath, filePath),
       );
 
       const { code } = await new Promise(resolve =>
         babel.transformFile(filePath, (err, result) => {
           if (err) {
             console.error(err);
           }
           resolve(result);
         }),
       );
       if (code) {
         await fs.outputFile(outPath, code);
       }
     }
   }
 };
 
 const runBabel = async () => {
   await Promise.all([
     fs.outputFile('./dist/package.json', JSON.stringify({ type: 'commonjs' })),
     transformDirectoryWithBabel('./src', './dist'),
   ]);
 };
 
 class BabelPlugin extends PluginBase {
   name = 'BabelPlugin';
 
   getHooks() {
     return {
       // This hook runs during the packaging of the final executable
       prePackage: [runBabel],
     };
   }
 
   // This function runs only in development mode, just before the
   // application starts
   async startLogic() {
     await runBabel();
     // startLogic allows us to run electron ourselves and return the process
     // object. Electron Forge (package which handles bundling, packaging and
     // running dev mode) will then watch it instead of spawing electron by
     // itself. But we are fine with the default behaviour (Electron Forge
     // spawning electron) so we return false.
     return false;
   }
 }
 
 module.exports = {
   packagerConfig: {
     name: 'Comm',
     icon: 'icons/icon',
     ignore: ['src', '.*config\\.cjs', '\\.eslintrc\\.json'],
     appBundleId: 'app.comm.macos',
     osxSign: { identity: 'Developer ID Application' },
     osxNotarize: {
       tool: 'notarytool',
       appleId: process.env?.APPLE_USER_NAME,
       appleIdPassword: process.env?.APPLE_APP_SPECIFIC_PASSWORD,
       teamId: process.env?.TEAM_ID,
     },
   },
   makers: [
     {
       name: '@electron-forge/maker-dmg',
       platforms: ['darwin'],
       config: {
         icon: 'icons/icon.icns',
         background: 'icons/dmg_background.png',
         additionalDMGOptions: {
           'code-sign': {
             'signing-identity': 'Developer ID Application',
             'identifier': 'app.comm.macos',
           },
         },
         contents: opts => [
           { x: 340, y: 100, type: 'link', path: '/Applications' },
           { x: 100, y: 100, type: 'file', path: opts.appPath },
         ],
       },
     },
     {
       name: '@electron-forge/maker-squirrel',
       platforms: ['win32'],
       config: {
         name: 'Comm',
         title: 'Comm',
-        authors: 'Comm',
+        authors: 'Comm Technologies, Inc.',
         description: 'Comm is a private messaging app for communities!',
         iconUrl: 'https://comm-external.s3.amazonaws.com/icon.ico',
         setupIcon: 'icons/icon.ico',
         loadingGif: 'icons/win_installer.gif',
+        certificateFile: process.env?.WINDOWS_CERTIFICATE,
+        certificatePassword: process.env?.WINDOWS_PASSWORD,
       },
     },
   ],
   plugins: [new BabelPlugin()],
   hooks: {
     generateAssets: async () => {
       await Promise.all([
         fs.copy('../keyserver/fonts', './assets/fonts'),
         fs.copy('../web/theme.css', './assets/theme.css'),
         fs.copy('../web/typography.css', './assets/typography.css'),
       ]);
     },
     prePackage: async (forgeConfig, platform, arch) => {
       if (
         arch === 'universal' &&
         (fs.existsSync('./out/Comm-darwin-x64') ||
           fs.existsSync('./out/Comm-darwin-arm64'))
       ) {
         throw new Error(
           'Due to a bug in @electron/universal, please first run ' +
             '`yarn clean-build` or remove previous builds artifacts: ' +
             '"out/Comm-darwin-x64" and/or "out/Comm-darwin-arm64"\n',
         );
       }
     },
   },
 };