diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 68e0e674..99838c8c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
         config:
           - name: Windows MSVC (dynamic)
             os: windows
-            os-version: 2022
+            os-version: 2025
             environment: msvc
             shell: pwsh
             static: false
@@ -25,7 +25,7 @@ jobs:
 
           - name: Windows MSVC (static)
             os: windows
-            os-version: 2022
+            os-version: 2025
             environment: msvc
             shell: pwsh
             static: true
@@ -33,7 +33,7 @@ jobs:
 
           - name: Windows MingGW
             os: windows
-            os-version: 2022
+            os-version: 2025
             environment: mingw
             architecture: x86_64
             shell: 'msys2 {0}'
@@ -41,7 +41,7 @@ jobs:
 
           - name: Windows UCRT
             os: windows
-            os-version: 2022
+            os-version: 2025
             environment: ucrt
             architecture: ucrt-x86_64
             shell: 'msys2 {0}'
@@ -90,7 +90,7 @@ jobs:
 
           - name: MacOS (Arm64)
             os: macos
-            os-version: 14
+            os-version: 15
             arm: true
             shell: bash
             fatal_warnings: true
diff --git a/.github/workflows/windows_installer.yml b/.github/workflows/windows_installer.yml
index f3ed85aa..8e86f817 100644
--- a/.github/workflows/windows_installer.yml
+++ b/.github/workflows/windows_installer.yml
@@ -9,8 +9,7 @@ on:
 jobs:
   installer:
     name: Windows MSVC Installer
-    runs-on: windows-2022
-
+    runs-on: windows-2025
     defaults:
       run:
         shell: pwsh
@@ -30,15 +29,10 @@ jobs:
         run: |
           pip install meson
 
-      - name: Download EnVar plugin for NSIS
-        uses: carlosperate/download-file-action@v2
+      - name: Install NSIS with EnVar plugin
+        uses: repolevedavaj/install-nsis@v1.0.3
         with:
-          file-url: https://nsis.sourceforge.io/mediawiki/images/7/7f/EnVar_plugin.zip
-          file-name: envar_plugin.zip
-          location: ${{ github.workspace }}
-
-      - name: Extract EnVar plugin
-        run: 7z x "-oC:/Program Files (x86)/NSIS" "${{ github.workspace }}/envar_plugin.zip"
+          nsis-version: '3.11'
 
       - name: Configure
         run: meson setup build -Dbuildtype=release -Ddefault_library=shared -Dbuild_installer=true -Drun_in_ci=true