diff --git a/.editorconfig b/.editorconfig
index a873b41c..6696ba18 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,11 +12,12 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 
+[{*.yaml,*.yml}]
+indent_size = 2
+
 [*.json]
 ij_formatter_enabled = true
-indent_style = space
 indent_size = 2
-trim_trailing_whitespace = true
 
 # C# files
 [*.cs]
diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml
new file mode 100644
index 00000000..17cd3b56
--- /dev/null
+++ b/.github/workflows/dotnet-format.yml
@@ -0,0 +1,37 @@
+name: .NET Format
+
+on:
+  push:
+    branches:
+      - develop
+  pull_request:
+    branches: ["*"]
+    branches-ignore:
+      - main
+
+jobs:
+  dotnet-format:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.BYPASS_WORKFLOW_PAT }}
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0
+
+      - name: Restore Tool Dependencies
+        run: dotnet tool install -g csharpier
+
+      - name: CSharpier Format
+        run: csharpier format .
+
+      - uses: stefanzweifel/git-auto-commit-action@v6
+        with:
+          commit_message: .NET Format Style Fixes
+          commit_user_name: Format Bot