diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 0c7eaf94..102adc00 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: macos-13
+          - os: macos-15-intel
             build-type: debug
     steps:
       - name: Checkout code
@@ -25,7 +25,7 @@ jobs:
 
       - name: Install Qt 6 (homebrew)
         run: |
-          brew install ninja qt@6 
+          brew install qt@6
 
       - name: Setup CLang problem matcher
         # Technically, this action only supports GCC, but it seems to work well for Clang too.
@@ -36,7 +36,6 @@ jobs:
         env:
           VERBOSE: 1
         run: |
-          export CMAKE_BUILD_PARALLEL_LEVEL=$(sysctl -n hw.logicalcpu)
           cmake . --warn-uninitialized --warn-unused-vars \
               -G Ninja -B build \
               -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} \
@@ -53,7 +52,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: macos-13
+          - os: macos-15-intel
             qt-version: 6.5.2
             build-type: release
     steps:
@@ -96,14 +95,12 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew install create-dmg ninja
+          brew install create-dmg
 
       - name: Build (${{ matrix.build-type }})
         env:
-          TARGET_ARCH: x86_64;arm64
           VERBOSE: 1
         run: |
-          export CMAKE_BUILD_PARALLEL_LEVEL=$(sysctl -n hw.logicalcpu)
           cmake . --warn-uninitialized --warn-unused-vars \
               -B build -G Ninja \
               -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index deb95c4b..6acc4063 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -161,9 +161,12 @@ jobs:
 
       - name: Install latest Inno Setup
         run: |
-          winget install --id JRSoftware.InnoSetup --exact --silent --source winget
-          # Add to PATH
-          Add-Content $env:GITHUB_PATH "$env:LOCALAPPDATA\Programs\Inno Setup 6"
+          # Only installs if Inno Setup's Compiler (ISCC.exe) is not already in the PATH environment variable.
+          if (-Not (Get-Command ISCC -ErrorAction SilentlyContinue)) {
+              winget install --id JRSoftware.InnoSetup --exact --silent --source winget
+              # Add to PATH
+              Add-Content $env:GITHUB_PATH "$env:LOCALAPPDATA\Programs\Inno Setup 6"
+          }
 
       - name: Create installer
         run: |
diff --git a/docs/build_on_macos.md b/docs/build_on_macos.md
index 54e06c0b..3c372f1d 100644
--- a/docs/build_on_macos.md
+++ b/docs/build_on_macos.md
@@ -26,12 +26,6 @@ git clone https://github.com/nuttyartist/notes.git --recurse-submodules
 cd notes
 ```
 
-Optionally, if you want to dedicate all cores of your CPU to build Notes much faster, set this environment variable:
-
-```shell
-export CMAKE_BUILD_PARALLEL_LEVEL=$(sysctl -n hw.logicalcpu)
-```
-
 After that, we're ready to build Notes!
 
 Invoke CMake to configure and build the project into a folder called `build`, in [`Release` mode](https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html):