diff --git a/Makefile b/Makefile
deleted file mode 100644
index e06a91c..0000000
--- a/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-.PHONY: init # Init local environemnt
-init: 
-	pdm install
-
-.PHONY: clean # Clean/delete the builds
-
-define soc_target
-.PHONY: $(1) # Build RTLIL for the design
-$(strip $(1))/pins.lock:
-	@CHIPFLOW_ROOT=$(strip $(1)) PYTHONPATH=$PYTHONPATH:${PWD} pdm run chipflow pin lock
-
-$(1): $(strip $(1))/pins.lock
-	@CHIPFLOW_ROOT=$(strip $(1)) PYTHONPATH=$PYTHONPATH:${PWD} pdm run chipflow silicon prepare
-
-.PHONY: $(1)-submit # Submit RTLIL for build
-$(1)-submit: $(1)
-	@CHIPFLOW_ROOT=$(strip $(1)) PYTHONPATH=$PYTHONPATH:${PWD} pdm run chipflow silicon submit
-
-.PHONY: $(1)-clean # clean the design
-$(1)-clean:
-	rm -fr $(strip $(1))/build
-
-.PHONY: $(1)-lint
-$(1)-lint:
-	cd $(strip $(1))/design && pdm run lint
-
-clean: $(1)-clean
-endef
-
-$(eval $(call soc_target, upcounter))
-$(eval $(call soc_target, rom))
-$(eval $(call soc_target, sram))
-
-.PHONY: lint # Lint code
-lint: 
-	pdm run lint
diff --git a/pyproject.toml b/pyproject.toml
index db66ba8..09f6096 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,3 +38,9 @@ lint = [
 _.env_file = ".env.toolchain"
 #test.cmd = "pytest"
 lint.cmd = "pycodestyle --config=./.pycodestyle rom/ upcounter/ sram/"
+test-sram.working_dir = "./sram"
+test-sram.composite = [ "chipflow pin lock", "chipflow silicon submit"]
+test-rom.working_dir = "./rom"
+test-rom.composite = [ "chipflow pin lock", "chipflow silicon submit"]
+test-upcounter.working_dir = "./upcounter"
+test-upcounter.composite = [ "chipflow pin lock", "chipflow silicon submit"]