diff --git a/.air.toml b/.air.toml
new file mode 100644
index 00000000..f7f3a5d8
--- /dev/null
+++ b/.air.toml
@@ -0,0 +1,57 @@
+root = "."
+testdata_dir = "testdata"
+tmp_dir = "tmp"
+
+[build]
+args_bin = []
+bin = "./tmp/dozzle"
+cmd = "go build -race -o ./tmp/dozzle ."
+delay = 1000
+exclude_dir = [
+  "assets",
+  "tmp",
+  "data",
+  "node_modules",
+  "docs",
+  "test-results",
+  "dist",
+  "e2e",
+  "examples",
+]
+exclude_file = []
+exclude_regex = ["_test.go"]
+exclude_unchanged = false
+follow_symlink = false
+full_bin = ""
+include_dir = []
+include_ext = ["go", "tpl", "tmpl", "html"]
+include_file = []
+kill_delay = "2s"
+log = "build-errors.log"
+poll = false
+poll_interval = 0
+post_cmd = []
+pre_cmd = []
+rerun = false
+rerun_delay = 500
+send_interrupt = true
+stop_on_error = false
+
+[color]
+app = ""
+build = "yellow"
+main = "magenta"
+runner = "green"
+watcher = "cyan"
+
+[log]
+main_only = false
+silent = false
+time = false
+
+[misc]
+clean_on_exit = false
+
+[screen]
+clear_on_rebuild = false
+keep_scroll = true
diff --git a/.gitignore b/.gitignore
index fc88cb70..b20a307b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ coverage.out
 /playwright/.cache/
 *.pem
 *.csr
+tmp
diff --git a/.reflex.agent b/.reflex.agent
deleted file mode 100644
index b9c330c3..00000000
--- a/.reflex.agent
+++ /dev/null
@@ -1 +0,0 @@
--r '\.(go)$' -R 'node_modules' -G '\*\_test.go' -s -- go run -race main.go --level debug agent
diff --git a/.reflex.server b/.reflex.server
deleted file mode 100644
index 19ce32bd..00000000
--- a/.reflex.server
+++ /dev/null
@@ -1 +0,0 @@
--r '\.(go)$' -R 'node_modules' -G '\*\_test.go' -s -- go run -race main.go --level debug
diff --git a/Makefile b/Makefile
index 51d1ec45..6fa97f2c 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ push: docker
 tools:
 	go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
 	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
-	go install github.com/cespare/reflex@latest
+	go install github.com/air-verse/air@latest
 
 run: docker
 	docker run -it --rm -p 8080:8080 -v /var/run/docker.sock:/var/run/docker.sock amir20/dozzle:latest
diff --git a/internal/support/cli/args.go b/internal/support/cli/args.go
index 79dc99b6..da67c8c6 100644
--- a/internal/support/cli/args.go
+++ b/internal/support/cli/args.go
@@ -39,7 +39,7 @@ type HealthcheckCmd struct {
 }
 
 type AgentCmd struct {
-	Addr string `arg:"env:DOZZLE_AGENT_ADDR" default:":7007" help:"sets the host:port to bind for the agent"`
+	Addr string `arg:"--agent-addr,env:DOZZLE_AGENT_ADDR" default:":7007" help:"sets the host:port to bind for the agent"`
 }
 
 type AgentTestCmd struct {
diff --git a/package.json b/package.json
index 0bb0fea7..19900067 100644
--- a/package.json
+++ b/package.json
@@ -15,12 +15,12 @@
   "license": "ISC",
   "author": "Amir Raminfar <findamir@gmail.com>",
   "scripts": {
-    "agent:dev": "DOZZLE_AGENT_ADDR=localhost:7007 DEV=true reflex -c .reflex.agent",
+    "agent:dev": "DEV=true air -- agent --level debug --agent-addr localhost:7007",
     "watch:frontend": "vite --open http://localhost:3100/",
-    "watch:backend": "LIVE_FS=true DEV=true DOZZLE_ADDR=localhost:3100 reflex -c .reflex.server",
+    "watch:backend": "LIVE_FS=true DEV=true air -- --level debug --addr localhost:3100",
     "dev": "concurrently --kill-others \"npm:watch:*\"",
     "build": "vite build",
-    "preview": "LIVE_FS=true DOZZLE_ADDR=localhost:3100 reflex -c .reflex.server",
+    "preview": "LIVE_FS=true air -- --addr localhost:3100",
     "release": "bumpp",
     "test": "TZ=UTC vitest",
     "typecheck": "vue-tsc --noEmit",