diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0f8b861
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+.PHONY: all test clean
+
+all: .pre-build
+	@cargo make build
+
+.pre-build:
+ifndef $(cargo make --help)
+	@cargo install --force cargo-make
+endif
+
+test: .pre-build
+	@cargo make test
+
+clean:
+	@cargo clean
diff --git a/Makefile.toml b/Makefile.toml
new file mode 100644
index 0000000..e820157
--- /dev/null
+++ b/Makefile.toml
@@ -0,0 +1,2 @@
+[env]
+CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
diff --git a/multiplier/Makefile.toml b/multiplier/Makefile.toml
new file mode 100644
index 0000000..b4cce21
--- /dev/null
+++ b/multiplier/Makefile.toml
@@ -0,0 +1,7 @@
+[tasks.build]
+command = "cargo"
+args = ["build", "--release"]
+
+[tasks.test]
+command = "cargo"
+args = ["test", "--release"]
diff --git a/private-settlement/Makefile.toml b/private-settlement/Makefile.toml
new file mode 100644
index 0000000..b4cce21
--- /dev/null
+++ b/private-settlement/Makefile.toml
@@ -0,0 +1,7 @@
+[tasks.build]
+command = "cargo"
+args = ["build", "--release"]
+
+[tasks.test]
+command = "cargo"
+args = ["test", "--release"]
diff --git a/rln-wasm/Makefile.toml b/rln-wasm/Makefile.toml
index f58f8f6..d0a7785 100644
--- a/rln-wasm/Makefile.toml
+++ b/rln-wasm/Makefile.toml
@@ -1,6 +1,3 @@
-[env]
-CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
-
 [tasks.pack-build]
 command = "wasm-pack"
 args = ["build", "--release", "--target", "web", "--scope", "waku"]
diff --git a/rln/Makefile.toml b/rln/Makefile.toml
new file mode 100644
index 0000000..b4cce21
--- /dev/null
+++ b/rln/Makefile.toml
@@ -0,0 +1,7 @@
+[tasks.build]
+command = "cargo"
+args = ["build", "--release"]
+
+[tasks.test]
+command = "cargo"
+args = ["test", "--release"]
diff --git a/semaphore/Makefile.toml b/semaphore/Makefile.toml
new file mode 100644
index 0000000..b4cce21
--- /dev/null
+++ b/semaphore/Makefile.toml
@@ -0,0 +1,7 @@
+[tasks.build]
+command = "cargo"
+args = ["build", "--release"]
+
+[tasks.test]
+command = "cargo"
+args = ["test", "--release"]
diff --git a/utils/Makefile.toml b/utils/Makefile.toml
new file mode 100644
index 0000000..b4cce21
--- /dev/null
+++ b/utils/Makefile.toml
@@ -0,0 +1,7 @@
+[tasks.build]
+command = "cargo"
+args = ["build", "--release"]
+
+[tasks.test]
+command = "cargo"
+args = ["test", "--release"]