diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 142374ecac5..ee3c3299bda 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -57,8 +57,8 @@ jobs:
       - name: Package
         working-directory: "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}"
         run: python mach package --release --target=x86_64-uwp-windows-msvc --uwp=x64
-        #env:
-        #  CODESIGN_CERT: {'${{ secrets.WINDOWS_CODESIGN_CERT }}'}
+        env:
+          CODESIGN_CERT: ${{ secrets.WINDOWS_CODESIGN_CERT }}
       - name: Tidy
         run: python mach test-tidy --force-cpp --no-wpt
 
@@ -72,18 +72,18 @@ jobs:
       - name: Copy to C drive
         run: cp D:\a C:\ -Recurse
       - name: Bootstrap
-        working-directory: "C:\\a\\servo\\servo"
+        working-directory: "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}"
         run: |
           python -m pip install --upgrade pip virtualenv
           python mach fetch
       - name: Release build
-        working-directory: "C:\\a\\servo\\servo"
+        working-directory: "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}"
         run: python mach build --release --target=aarch64-uwp-windows-msvc
       - name: Package
-        working-directory: "C:\\a\\servo\\servo"
+        working-directory: "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}"
         run: python mach package --release --target=aarch64-uwp-windows-msvc --uwp=arm64
-        #env:
-        #  CODESIGN_CERT: {'${{ secrets.WINDOWS_CODESIGN_CERT }}'}
+        env:
+          CODESIGN_CERT: ${{ secrets.WINDOWS_CODESIGN_CERT }}
 
   build-mac:
     name: Build (macOS)
diff --git a/etc/ci/workflow.mako b/etc/ci/workflow.mako
index b0eda06be82..3800767de4f 100644
--- a/etc/ci/workflow.mako
+++ b/etc/ci/workflow.mako
@@ -57,8 +57,8 @@ jobs:
       - name: Package
         working-directory: "C:\\a\\${ REPOSITORY_NAME }\\${ REPOSITORY_NAME }"
         run: python mach package --release --target=x86_64-uwp-windows-msvc --uwp=x64
-        #env:
-        #  CODESIGN_CERT: ${{ CODESIGN_CERT }}
+        env:
+          CODESIGN_CERT: ${ CODESIGN_CERT }
       - name: Tidy
         run: python mach test-tidy --force-cpp --no-wpt
 
@@ -72,18 +72,18 @@ jobs:
       - name: Copy to C drive
         run: cp D:\a C:\ -Recurse
       - name: Bootstrap
-        working-directory: "C:\\a\\servo\\servo"
+        working-directory: "C:\\a\\${ REPOSITORY_NAME }\\${ REPOSITORY_NAME }"
         run: |
           python -m pip install --upgrade pip virtualenv
           python mach fetch
       - name: Release build
-        working-directory: "C:\\a\\servo\\servo"
+        working-directory: "C:\\a\\${ REPOSITORY_NAME }\\${ REPOSITORY_NAME }"
         run: python mach build --release --target=aarch64-uwp-windows-msvc
       - name: Package
-        working-directory: "C:\\a\\servo\\servo"
+        working-directory: "C:\\a\\${ REPOSITORY_NAME }\\${ REPOSITORY_NAME }"
         run: python mach package --release --target=aarch64-uwp-windows-msvc --uwp=arm64
-        #env:
-        #  CODESIGN_CERT: ${{ CODESIGN_CERT }}
+        env:
+          CODESIGN_CERT: ${ CODESIGN_CERT }
 
   build-mac:
     name: Build (macOS)