diff --git a/.github/workflows/upload-assets.yml b/.github/workflows/upload-assets.yml
index 7401d45d6d5..092dcffe698 100644
--- a/.github/workflows/upload-assets.yml
+++ b/.github/workflows/upload-assets.yml
@@ -37,8 +37,8 @@ jobs:
       - name: Install cargo-make
         uses: actions-rs/cargo@v1
         with:
-          command: build
-          args: --release
+          command: install
+          args: --force cargo-make
 
       - name: Build release binaries
         uses: actions-rs/cargo@v1
diff --git a/Makefile.toml b/Makefile.toml
new file mode 100644
index 00000000000..597dd120564
--- /dev/null
+++ b/Makefile.toml
@@ -0,0 +1,71 @@
+[env]
+CFG_RELEASE = { value = "${CARGO_MAKE_RUST_VERSION}", condition = { env_not_set = ["CFG_RELEASE"] } }
+CFG_RELEASE_CHANNEL = { value = "${CARGO_MAKE_RUST_CHANNEL}", condition = { env_not_set = ["CFG_RELEASE_CHANNEL"] } }
+
+[tasks.build-bin]
+command = "cargo"
+args = [
+  "build",
+  "--bin",
+  "rustfmt",
+  "--bin",
+  "cargo-fmt",
+]
+
+[tasks.build-bins]
+command = "cargo"
+args = [
+  "build",
+  "--bins",
+]
+
+[tasks.install]
+command = "cargo"
+args = [
+  "install",
+  "--path",
+  ".",
+  "--force",
+  "--locked", # Respect Cargo.lock
+]
+
+[tasks.release]
+command = "cargo"
+args = [
+  "build",
+	"--release",
+]
+
+[tasks.test]
+command = "cargo"
+args = [
+  "test",
+]
+
+[tasks.test-all]
+dependencies = ["build-bin"]
+run_task = { name = ["test", "test-ignored"] }
+
+[tasks.test-ignored]
+command = "cargo"
+args = [
+  "test",
+	"--",
+	"--ignored",
+]
+
+[tasks.b]
+alias = "build"
+
+[tasks.bb]
+alias = "build-bin"
+
+[tasks.bins]
+alias = "build-bins"
+
+[tasks.c]
+alias = "check"
+
+[tasks.t]
+alias = "test"
+