diff --git a/.github/workflows/build-and-sign.yml b/.github/workflows/build-and-sign.yml
index f2c98a9e1a..4f07d6ca25 100644
--- a/.github/workflows/build-and-sign.yml
+++ b/.github/workflows/build-and-sign.yml
@@ -64,16 +64,12 @@ jobs:
         run: npm run lint
 
       - name: Build application
-        run: |
-          npm run build
-          npm run clean:dist
+        run: npm run build
 
       - name: Build & Sign
-        shell: pwsh
         run: |
-          $certName = "`u{22}Bitwarden Inc`u{22}"
-          npx electron-builder --win --x64 --ia32 -p never -c.win.certificateSubjectName="`u{22}Bitwarden Inc`u{22}"
-          Write-Host "certName=$certName"
+          npm run build
+          npm run pack:win
         env:
           CSC_LINK: ${{ secrets.EB_SIGNING_CERT_IDENTIFIER_URL }}
           CSC_KEY_PASSWORD: ${{ secrets.EB_SIGNING_CERT_KEY }}
diff --git a/package.json b/package.json
index e1870315cb..6853efa81d 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "pack:mac": "npm run clean:dist && electron-builder --mac -p never",
     "pack:mac:mas": "npm run clean:dist && electron-builder --mac mas -p never",
     "pack:mac:masdev": "npm run clean:dist && electron-builder --mac mas-dev -p never",
-    "pack:win": "npm run clean:dist && electron-builder --win --x64 --ia32 -p never -c.win.certificateSubjectName=\"8bit Solutions LLC\"",
+    "pack:win": "npm run clean:dist && electron-builder --win --x64 --ia32 -p never -c.win.certificateSubjectName=\"Bitwarden Inc\"",
     "pack:win:ci": "npm run clean:dist && electron-builder --win --x64 --ia32 -p never",
     "dist:dir": "npm run build && npm run pack:dir",
     "dist:lin": "npm run build && npm run pack:lin",