diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 0000000000..2b92910ea0
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "coveralls.net": {
+      "version": "1.0.0",
+      "commands": [
+        "csmacnz.Coveralls"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c0746e229f..d671d13680 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,8 +31,7 @@ jobs:
 
       - name: Install tools
         run: |
-          dotnet tool install dotnet-format --version 4.1.131201 --tool-path tools
-          dotnet tool install coveralls.net --version 1.0.0 --tool-path tools
+          dotnet tool restore
 
       - name: Build Release
         run: dotnet build src -c Release /p:ContinuousIntegrationBuild=true
@@ -55,7 +54,7 @@ jobs:
           # token is available before invoking Coveralls.
           if [ ! -z "${COVERALLS_REPO_TOKEN}" ];
           then
-            ./tools/csmacnz.Coveralls --opencover -i src/StripeTests/coverage.netcoreapp3.1.opencover.xml --useRelativePaths
+            dotnet tool run csmacnz.Coveralls --opencover -i src/StripeTests/coverage.netcoreapp3.1.opencover.xml --useRelativePaths
           fi
         env:
           CI_NAME: github-actions
diff --git a/Makefile b/Makefile
index ea118dd431..b04d0474d6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,4 +4,4 @@ update-version:
 	@perl -pi -e 's|<Version>[.\d]+</Version>|<Version>$(VERSION)</Version>|' src/Stripe.net/Stripe.net.csproj
 
 codegen-format:
-	dotnet format src/Stripe.net.sln
+	dotnet format whitespace src/Stripe.net/