diff --git a/Makefile b/Makefile
index 14e7056..0acac00 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,16 @@
-.PHONY: tidy templ sqlc worker radar
+export ROOT_DIR := $(shell git rev-parse --show-toplevel)
+export RADAR_ROOT := $(ROOT_DIR)/cmd/radar
+export WORKER_ROOT := $(ROOT_DIR)/cmd/worker
+export SQLC_ROOT := $(ROOT_DIR)/internal/db
+export MIGRATE_ROOT := $(ROOT_DIR)/internal/migrations
+export RADAR_OUT := $(RADAR_ROOT)/build/app.wasm
+export WORKER_OUT := $(WORKER_ROOT)/build/app.wasm
 
-all: help 
+.PHONY: install clean help
+
+install:
+	@go mod download
+	@go install github.com/syumai/workers/cmd/workers-assets-gen@latest
 
 clean:
 	@rm -rf ./build
@@ -20,12 +30,17 @@ help:
 	@echo "  worker      Build and deploy worker"
 	@echo "  radar       Build and deploy radar"
 
+.PHONY: templ sqlc
+
 templ:
-	@devbox run gen:templ
+	@templ generate
 
 sqlc:
 	@devbox run gen:sqlc
 
+migrate:
+	@cd $(MIGRATE_ROOT) && task
+
 worker:
 	@devbox run serve:worker
 
diff --git a/cmd/radar/Makefile b/cmd/radar/Makefile
new file mode 100644
index 0000000..6708976
--- /dev/null
+++ b/cmd/radar/Makefile
@@ -0,0 +1,12 @@
+export ROOT_DIR := $(shell git rev-parse --show-toplevel)
+
+.PHONY: build start deploy
+build:
+	workers-assets-gen -mode=go
+	GOOS=js GOARCH=wasm go build -ldflags="-s -w" -o ./build/app.wasm .
+
+start:
+	wrangler dev
+
+deploy: 
+	wrangler deploy
diff --git a/cmd/radar/package.json b/cmd/radar/package.json
index 6e6a631..16fb0a8 100644
--- a/cmd/radar/package.json
+++ b/cmd/radar/package.json
@@ -2,10 +2,6 @@
   "name": "@sonr-io/radar-worker",
   "version": "0.0.1",
   "private": true,
-  "scripts": {
-    "deploy": "wrangler deploy",
-    "start": "wrangler dev"
-  },
   "dependencies": {
     "@extism/extism": "^2.0.0-rc11",
     "@helia/dag-cbor": "^1.0.1",
diff --git a/cmd/radar/wrangler.toml b/cmd/radar/wrangler.toml
index 2a67419..0124f25 100644
--- a/cmd/radar/wrangler.toml
+++ b/cmd/radar/wrangler.toml
@@ -8,7 +8,7 @@ routes = [
 ]
 
 [build]
-command = "devbox run build:radar"
+command = "make build"
 
 [dev]
 port = 4242
diff --git a/cmd/worker/Makefile b/cmd/worker/Makefile
new file mode 100644
index 0000000..30d7e8c
--- /dev/null
+++ b/cmd/worker/Makefile
@@ -0,0 +1,12 @@
+
+generate:
+	go run github.com/syumai/workers/cmd/workers-assets-gen -mode=go
+
+build: generate
+	GOOS=js GOARCH=wasm go build -ldflags="-s -w" -o ./build/app.wasm .
+
+start:
+	wrangler dev
+
+deploy: 
+	wrangler deploy
diff --git a/cmd/worker/package.json b/cmd/worker/package.json
index fccbfbb..a5ba59e 100644
--- a/cmd/worker/package.json
+++ b/cmd/worker/package.json
@@ -2,10 +2,6 @@
   "name": "@sonr-io/motr-worker",
   "version": "0.0.1",
   "private": true,
-  "scripts": {
-    "deploy": "wrangler deploy",
-    "start": "wrangler dev"
-  },
   "dependencies": {
     "@extism/extism": "^2.0.0-rc11",
     "@helia/dag-cbor": "^1.0.1",
diff --git a/cmd/worker/wrangler.toml b/cmd/worker/wrangler.toml
index b898e6a..4d9ade8 100644
--- a/cmd/worker/wrangler.toml
+++ b/cmd/worker/wrangler.toml
@@ -8,7 +8,7 @@ routes = [
 ]
 
 [build]
-command = "devbox run build:worker"
+command = "make build"
 
 [dev]
 port = 6969
diff --git a/devbox.json b/devbox.json
index f5ed82f..6128174 100644
--- a/devbox.json
+++ b/devbox.json
@@ -8,6 +8,11 @@
     "go-task@latest",
     "doppler@latest"
   ],
+  "env": {
+    "SONR_API_URL": "https://api.sonr.ws",
+    "SONR_RPC_URL": "https://rpc.sonr.ws",
+    "IPFS_GATEWAY": "https://cloudflare-ipfs.com/ipfs/"
+  },
   "shell": {
     "init_hook": [
       "export ROOT_DIR=$(git rev-parse --show-toplevel)",
@@ -17,8 +22,7 @@
       "export MIGRATE_ROOT=$ROOT_DIR/internal/migrations",
       "export RADAR_OUT=$RADAR_ROOT/build/app.wasm",
       "export WORKER_OUT=$WORKER_ROOT/build/app.wasm",
-      "go mod download",
-      "go install github.com/syumai/workers/cmd/workers-assets-gen@latest"
+      "go mod download"
     ],
     "scripts": {
       "release": [