diff --git a/dotnet-tools.json b/.config/dotnet-tools.json
similarity index 78%
rename from dotnet-tools.json
rename to .config/dotnet-tools.json
index cff10c3ea..b56ca6e21 100644
--- a/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -2,6 +2,12 @@
   "version": 1,
   "isRoot": true,
   "tools": {
+    "dotnet-format": {
+      "version": "5.1.250801",
+      "commands": [
+        "dotnet-format"
+      ]
+    },
     "swashbuckle.aspnetcore.cli": {
       "version": "5.0.0-rc4",
       "commands": [
diff --git a/.editorconfig b/.editorconfig
index 33b2aeac7..d8b5f71cc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,6 +5,7 @@ root = true
 
 # Don't use tabs for indentation.
 [*]
+end_of_line = lf
 indent_style = space
 # (Please don't specify an indent_size here; that has too many unintended consequences.)
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 590b84493..27dd616e0 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -22,6 +22,7 @@
 
 
 ## Before you submit
+- [ ] I have checked for formatting errors (`dotnet tool run dotnet-format --check`) (required)
 - [ ] If making database changes - I have also updated Entity Framework queries and/or migrations
 - [ ] I have added **unit tests** where it makes sense to do so (encouraged but not required)
 - [ ] This change requires a **documentation update** (notify the documentation team)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f5e24a44a..299489da4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -66,6 +66,15 @@ jobs:
       - name: Build solution
         run: msbuild bitwarden-server.sln /p:Configuration=Debug /verbosity:minimal
         shell: pwsh
+      
+      # TODO: This can be removed when upgrading to .NET 6
+      - name: Restore tools
+        run: dotnet tool restore
+        shell: pwsh
+
+      # - name: Verify Format
+      #   run: dotnet tool run dotnet-format --check
+      #   shell: pwsh
 
       - name: Test OSS solution
         run: dotnet test ./test --configuration Debug --no-build