diff --git a/.formal-git/components b/.formal-git/components
index 152014885..95a607e0b 100644
--- a/.formal-git/components
+++ b/.formal-git/components
@@ -15,7 +15,7 @@ fonts
 welcome
 scripts
 workflows
-winsign
+windows
 flatpak
 configs
 l10n
\ No newline at end of file
diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml
index a4e5a48b5..ec0870899 100644
--- a/.github/workflows/macos-release-build.yml
+++ b/.github/workflows/macos-release-build.yml
@@ -122,12 +122,9 @@ jobs:
 
       - name: Bootstrap
         run: |
-          cd engine
           export SURFER_PLATFORM="darwin"
           export PATH="$(python3 -m site --user-base)/bin":$PATH
-          # Always exist with 0, even if bootstrap fails
-          ./mach --no-interactive bootstrap --application-choice browser --no-system-changes --exclude macos-sdk || true
-          cd ..
+          npm run bootstrap
 
       - name: Build language packs
         run: sh scripts/download-language-packs.sh
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index 2393c091a..63cf18205 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -197,12 +197,14 @@ jobs:
           else
             rustup target add x86_64-pc-windows-msvc
           fi
+          # Stored in build/windows/.windows-rs-version
+          WINDOWS_RS_VERSION=$(cat build/windows/.windows-rs-version)
           cd engine/
           cargo install cargo-download --locked
-          cargo download -x windows=0.58.0
+          cargo download -x windows=$WINDOWS_RS_VERSION
           export CARGO_INCREMENTAL=0
           echo "" >> ../configs/common/mozconfig
-          echo "export MOZ_WINDOWS_RS_DIR=$(pwd)/windows-0.58.0" >> ../configs/common/mozconfig
+          echo "export MOZ_WINDOWS_RS_DIR=$(pwd)/windows-$WINDOWS_RS_VERSION" >> ../configs/common/mozconfig
 
       - name: Build language packs
         if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
diff --git a/build/windows/.windows-rs-version b/build/windows/.windows-rs-version
new file mode 100644
index 000000000..7c6425a5e
--- /dev/null
+++ b/build/windows/.windows-rs-version
@@ -0,0 +1 @@
+0.62.2
\ No newline at end of file
diff --git a/build/winsign/bootstrap.ps1 b/build/windows/bootstrap.ps1
similarity index 100%
rename from build/winsign/bootstrap.ps1
rename to build/windows/bootstrap.ps1
diff --git a/build/winsign/firefox_update.ps1 b/build/windows/firefox_update.ps1
similarity index 100%
rename from build/winsign/firefox_update.ps1
rename to build/windows/firefox_update.ps1
diff --git a/build/winsign/mar.exe b/build/windows/mar.exe
similarity index 100%
rename from build/winsign/mar.exe
rename to build/windows/mar.exe
diff --git a/build/winsign/sign.ps1 b/build/windows/sign.ps1
similarity index 100%
rename from build/winsign/sign.ps1
rename to build/windows/sign.ps1
diff --git a/scripts/fetch-formal-git-components.sh b/scripts/fetch-formal-git-components.sh
index 845c940a9..527483a3f 100644
--- a/scripts/fetch-formal-git-components.sh
+++ b/scripts/fetch-formal-git-components.sh
@@ -10,7 +10,7 @@ COMPONENT_ROOT=$(pwd)/src/zen
 EXTRA_COMPONENTS=(
   "scripts"
   "workflows"
-  "winsign"
+  "windows"
   "flatpak"
   "configs"
 )