diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 884252d65705..4b26344bbdd6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,10 +49,7 @@ jobs:
 
     if: github.repository_owner == 'files-community'
 
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: pwsh
+    runs-on: windows-latest
 
     steps:
 
@@ -62,10 +59,8 @@ jobs:
         fetch-depth: 2
     - name: Setup .NET 8
       uses: actions/setup-dotnet@v4
-      with:
-        global-json-file: global.json
 
-    - name: Install XamlStyler console
+    - name: Install XamlStyler.Console
       run: 'dotnet tool install --global XamlStyler.Console'
 
     - name: Check XAML formatting
diff --git a/.github/workflows/format-xaml.yml b/.github/workflows/format-xaml.yml
index 6841504eab3a..a55f8254b09f 100644
--- a/.github/workflows/format-xaml.yml
+++ b/.github/workflows/format-xaml.yml
@@ -6,11 +6,8 @@ on:
 jobs:
   format-xaml:
     if: github.event.issue.pull_request && github.event.comment.body == '/format'
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     environment: Pull Requests
-    defaults:
-      run:
-        shell: pwsh
     permissions: 
       contents: write
 
@@ -48,8 +45,6 @@ jobs:
 
       - name: Setup .NET 8
         uses: actions/setup-dotnet@v4
-        with:
-          global-json-file: global.json
 
       - name: Set git identity
         if: env.CAN_RUN == 1
@@ -79,7 +74,7 @@ jobs:
             "CAN_RUN=0" | Out-File -FilePath $env:GITHUB_ENV -Append
           }
   
-      - name: Install Xaml Styler
+      - name: Install XamlStyler.Console
         if: env.CAN_RUN == 1
         run: dotnet tool install --global XamlStyler.Console