3 files changed, 7 insertions, 17 deletions

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index fe24129ab..abc1b50d8 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -373,16 +373,14 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }}
           CSC_IDENTITY_AUTO_DISCOVERY: true
-          # TODO: Commented out the code signing process for now (so as to at least get unsigned nightlies available for testing)
-          # WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
-          # WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
+          WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
+          WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
       - name: Build Ferdium with publish for 'release' branch
         if: ${{ env.GIT_BRANCH_NAME == 'release' }}
         run: npm run build -- --publish always
         shell: bash
         env:
           GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }}
-          CSC_IDENTITY_AUTO_DISCOVERY: false
-          # TODO: Commented out the code signing process for now (so as to at least get unsigned nightlies available for testing)
-          # WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
-          # WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
+          CSC_IDENTITY_AUTO_DISCOVERY: true
+          WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
+          WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
diff --git a/README.md b/README.md
index 87006e667..52510aa22 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,6 @@
 - [Ferdium](#ferdium)
   - [Screenshots](#screenshots)
   - [Download](#download)
-  - [Unsigned Nightlies on MacOS](#unsigned-nightlies-on-macos)
-  - [Unsigned Nightlies on Windows](#unsigned-nightlies-on-windows)
   - [Migrating from Ferdi](#migrating-from-ferdi)
   - [Contributing](#contributing)
   - [Contributors ✨](#contributors-)
@@ -54,13 +52,6 @@ Assets made available via [GitHub releases](https://github.com/ferdium/ferdium-a
 
 _Find answers to frequently asked questions on [ferdium.org/faq](https://ferdium.org/faq)._
 
-## Unsigned Nightlies on Windows
-
-Similarly to the MacOS, we do not currently have a certificate to sign the nightlies on Windows. For this reason, an error will appear when launching the setup tool or the portable app if your execution policy is not set to `Bypass` or `Unrestricted`. In order to allow the script to run, it is sufficient to right-click on the `.exe` to access its properties and to tick the box labeled `Unblock` at the bottom of the General tab. Alternatively, you could execute the following in a PowerShell:
-```PowerShell
-Unblock-File -Path .\Ferdium-Setup-6.0.0-nightly.xx.exe; .\Ferdium-Setup-6.0.0-nightly.xx.exe
-```
-
 ## Migrating from Ferdi
 
 If you are a pre-existing user of Ferdi, and are thinking of switching to Ferdium, you might want to run [the following scripts](./scripts/migration) to migrate your existing Ferdi profile such that Ferdium can pick up the configurations. (.ps1 for PowerShell/Windows users and .sh for UNIX (Linux and MacOS users)
diff --git a/electron-builder.yml b/electron-builder.yml
index a7763ebf0..93c59e52e 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -64,7 +64,8 @@ win:
       arch: [x64, ia32]
     - target: portable
       arch: [x64, ia32]
-  publisherName: "Ferdium Contributors"
+  # The name of the CN appearing in the certificate must be present in the publisherName list below
+  publisherName: ["Ferdium Contributors", "Ambroise Grau"]
 
 linux:
   icon: ./build-helpers/images/icons