diff --git a/.github/workflows/dotnet-autoformat-pr-push.yml b/.github/workflows/dotnet-autoformat-pr-push.yml
index 6730e30e8ec9..e0dd0e6fcbd8 100644
--- a/.github/workflows/dotnet-autoformat-pr-push.yml
+++ b/.github/workflows/dotnet-autoformat-pr-push.yml
@@ -12,13 +12,13 @@ permissions:
 jobs:
   push-and-notify:
     name: Push autoformatted code and notify user
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     if: >
       github.event.workflow_run.event == 'pull_request' &&
       github.event.workflow_run.conclusion == 'success'
     steps:
       - name: 'Push autoformatted patch'
-        uses: rolfbjarne/autoformat-push@v0.2
+        uses: rolfbjarne/autoformat-push@v0.5
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           commentContents: 'Thank you for your pull request. We are auto-formatting your source code to follow our code guidelines.'
diff --git a/.github/workflows/dotnet-autoformat-pr.yml b/.github/workflows/dotnet-autoformat-pr.yml
index dcb055c50335..3032f11cfeb6 100644
--- a/.github/workflows/dotnet-autoformat-pr.yml
+++ b/.github/workflows/dotnet-autoformat-pr.yml
@@ -8,11 +8,11 @@ permissions:
 jobs:
   autoformat-code:
     name: code format check
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
     - name: 'Autoformat'
-      uses: rolfbjarne/autoformat@v0.2
+      uses: rolfbjarne/autoformat@v0.5
       with:
         script: 'dotnet format Microsoft.Maui.sln --no-restore --exclude Templates/src BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs Graphics/src/Graphics.Win2D/W2DCanvas.cs Graphics/src/Graphics.Win2D/W2DExtensions.cs'
         onlyFilesModifiedInPullRequest: true