diff --git a/.gitignore b/.gitignore
index eb179ba..fe9edd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
 
 # Robbie's local helper script for `multi proxy`
 /ping.sh
+
+# Generated by Cargo Make
+/docs
diff --git a/Cargo.toml b/Cargo.toml
index ac3feb2..3635a58 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,12 +46,12 @@ tokio-stream = { version = "0.1", features = ["time"] }
 toml = { version = "0.8.8", features = ["preserve_order"] }
 tracing = { version = "0.1.41", features = ["attributes"] }
 tracing-subscriber = { version = "0.3.19", features = [
-    "json",
-    "local-time",
-    "time",
-    "chrono",
-    "fmt",
-    "env-filter",
+  "json",
+  "local-time",
+  "time",
+  "chrono",
+  "fmt",
+  "env-filter",
 ] }
 uuid = { version = "1.9", features = ["serde", "v4"] }
 
diff --git a/Makefile.toml b/Makefile.toml
index 8f0c3b9..e882050 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -3,40 +3,32 @@ default_to_workspace = false
 
 [env]
 CARGO_MAKE_CLIPPY_ARGS = "-- --no-deps"
+CARGO_MAKE_FORMAT_TOML_FILES = "*.toml"
 CARGO_MAKE_COVERAGE_PROVIDER = "llvm-cov"
+CARGO_MAKE_RUN_TOML_FORMAT = true
+CARGO_MAKE_SKIP_SLOW_SECONDARY_FLOWS = true
 
 [tasks.dev-test-flow]
 dependencies = [
-  "pre-build",
   "format-flow",
+  "format-toml-conditioned-flow",
   "clippy-flow",
-  "build",
-  "post-build",
-  "pre-docs",
-  "docs",
-  "post-docs",
+  "build-flow",
+  "docs-flow",
   "test-flow",
 ]
 
 [tasks.pre-build]
-dependencies = [
-  "sort-ci",
-  "format-toml-conditioned-flow",
-  "unused-dependencies-flow",
-]
+dependencies = ["sort-ci", "unused-dependencies-flow"]
 
 [tasks.ci-flow]
 dependencies = [
   "pre-ci-flow",
   "print-env-flow",
-  "pre-build",
   "check-format-flow",
   "clippy-flow",
-  "build",
-  "post-build",
-  "pre-docs",
-  "docs",
-  "post-docs",
+  "build-flow",
+  "docs-flow",
   "test-flow",
   "coverage-flow",
   "post-ci-flow",
@@ -46,12 +38,12 @@ dependencies = [
 workspace = true
 description = "Run our test suite"
 command = "cargo"
-args = [ 
-  "nextest", 
-  "run", 
+args = [
+  "nextest",
+  "run",
   "--locked",
-  "@@remove-empty(CARGO_MAKE_CARGO_VERBOSE_FLAGS)", 
-  "@@split(CARGO_MAKE_CARGO_BUILD_TEST_FLAGS, )"
+  "@@remove-empty(CARGO_MAKE_CARGO_VERBOSE_FLAGS)",
+  "@@split(CARGO_MAKE_CARGO_BUILD_TEST_FLAGS, )",
 ]
 
 [tasks.help]
@@ -60,10 +52,10 @@ description = "List help text for wack executable"
 category = "Development"
 args = [
   "run",
-  "@@remove-empty(CARGO_MAKE_CARGO_VERBOSE_FLAGS)", 
+  "@@remove-empty(CARGO_MAKE_CARGO_VERBOSE_FLAGS)",
   "@@split(CARGO_MAKE_CARGO_BUILD_TEST_FLAGS, )",
   "--",
-  "--help"
+  "--help",
 ]
 
 [tasks.outdated]
@@ -82,7 +74,7 @@ workspace = true
 description = "Calculate the LoC in src."
 category = "Development"
 command = "tokei"
-args = [ "." ]
+args = ["."]
 
 [tasks.sort-ci]
 description = "Assert that Cargo.toml is sorted."
@@ -104,5 +96,5 @@ args = [
   "nextest",
   "--",
   "--lib",
-  "@@split(CARGO_MAKE_CARGO_BUILD_TEST_FLAGS, )"
+  "@@split(CARGO_MAKE_CARGO_BUILD_TEST_FLAGS, )",
 ]
diff --git a/dist-workspace.toml b/dist-workspace.toml
index dfdf6d8..e297e83 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -14,7 +14,12 @@ github-build-setup = "release-prebuild.yml.stub"
 # The installers to generate for each app
 installers = ["shell", "homebrew"]
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu"]
+targets = [
+  "aarch64-apple-darwin",
+  "aarch64-unknown-linux-gnu",
+  "x86_64-apple-darwin",
+  "x86_64-unknown-linux-gnu",
+]
 # Path that installers should place binaries in
 install-path = "CARGO_HOME"
 # Whether to install an updater program
@@ -30,12 +35,10 @@ publish-jobs = ["homebrew"]
 [dist.github-custom-runners]
 x86_64-unknown-linux-gnu = "ubuntu-22.04"
 aarch64-unknown-linux-gnu = "ubuntu-22.04-arm"
- 
+
 # Also failing, but maybe unrelated?
 # x86_64-pc-windows-msvc = "ubuntu-22.04"
 
 # aarch64-apple-darwin = "ubuntu-22.04"
 # aarch64-pc-windows-msvc = "ubuntu-22.04"
 # x86_64-apple-darwin = "ubuntu-22.04"
-
-