diff --git a/.air.toml b/.air.toml
index dd0faa01f23..2959e88838e 100644
--- a/.air.toml
+++ b/.air.toml
@@ -1,13 +1,13 @@
 [build]
-bin = "./bin/grafana"
+bin = "./bin/grafana-air"
 args_bin = ["server", "-profile", "-profile-addr=127.0.0.1", "-profile-port=6000", "-profile-block-rate=1", "-profile-mutex-rate=5", "-packaging=dev", "cfg:app_mode=development"]
-cmd = "make GO_BUILD_DEV=1 build-backend"
+cmd = "make GO_BUILD_DEV=1 build-air"
 exclude_regex = ["_test.go", "_gen.go"]
 exclude_unchanged = true
 follow_symlink = true
-include_dir = ["apps", "conf", "devenv/dev-dashboards", "pkg", "public/views"]
+include_dir = ["apps", "conf", "pkg", "public/views"]
 include_ext = ["go", "ini", "toml", "html", "json"]
-stop_on_error = false
+stop_on_error = true
 send_interrupt = true
 kill_delay = 500
 
diff --git a/Makefile b/Makefile
index b6ea79ea13e..229e27319a0 100644
--- a/Makefile
+++ b/Makefile
@@ -245,6 +245,10 @@ build-backend: ## Build Grafana backend.
 	@echo "build backend"
 	$(GO) run build.go $(GO_BUILD_FLAGS) build-backend
 
+.PHONY: build-air
+build-air: build-backend
+	@cp ./bin/grafana ./bin/grafana-air
+
 .PHONY: build-server
 build-server: ## Build Grafana server.
 	@echo "build server"