diff --git a/Makefile b/Makefile
index 28c770af9..5cb039f82 100644
--- a/Makefile
+++ b/Makefile
@@ -36,17 +36,19 @@ IMAGE_PATH ?= "/nginx/agent"
 TAG ?= ""
 NGINX_LICENSE_JWT ?= ""
 
-BUILD_DIR		:= build
-TEST_BUILD_DIR  := build/test
-CERTS_DIR       := build/certs
+BUILD_DIR       := $(shell pwd)/build
+RUN_DIR	        := $(BUILD_DIR)/run
+TEST_BUILD_DIR  := $(BUILD_DIR)/test
+CERTS_DIR       := $(BUILD_DIR)/certs
 DOCS_DIR        := docs
 PROTO_DIR       := proto
-BINARY_NAME		:= nginx-agent
-PROJECT_DIR		= cmd/agent
-PROJECT_FILE	= main.go
-COLLECTOR_PATH  ?= /etc/nginx-agent/opentelemetry-collector-agent.yaml
-LIB_DIR	        ?= /var/lib/nginx-agent
-DIRS            = $(BUILD_DIR) $(TEST_BUILD_DIR) $(BUILD_DIR)/$(DOCS_DIR) $(BUILD_DIR)/$(DOCS_DIR)/$(PROTO_DIR)
+BINARY_NAME     := nginx-agent
+PROJECT_DIR     = cmd/agent
+PROJECT_FILE    = main.go
+LOG_PATH        ?= $(RUN_DIR)/agent.log
+COLLECTOR_PATH  ?= $(RUN_DIR)
+LIB_DIR         ?= $(RUN_DIR)
+DIRS            = $(BUILD_DIR) $(RUN_DIR) $(TEST_BUILD_DIR) $(BUILD_DIR)/$(DOCS_DIR) $(BUILD_DIR)/$(DOCS_DIR)/$(PROTO_DIR)
 $(shell mkdir -p $(DIRS))
 
 VERSION ?= $(shell git describe --match "v[0-9]*" --abbrev=0 --tags)
@@ -202,7 +204,12 @@ run: build ## Run code
 
 dev: ## Run agent executable
 	@echo "🚀 Running App"
-	NGINX_AGENT_COLLECTOR_CONFIG_PATH=$(COLLECTOR_PATH) NGINX_AGENT_LIB_DIR=$(LIB_DIR) $(GORUN) -ldflags=$(DEBUG_LDFLAGS) $(PROJECT_DIR)/$(PROJECT_FILE)
+	touch $(LOG_PATH)
+	NGINX_AGENT_COLLECTOR_CONFIG_PATH=$(COLLECTOR_PATH)/opentelemetry-collector-agent.yaml \
+	NGINX_AGENT_COLLECTOR_LOG_LEVEL="DEBUG" \
+	NGINX_AGENT_COLLECTOR_LOG_PATH=$(COLLECTOR_PATH)/otel.log \
+	NGINX_AGENT_LIB_DIR=$(LIB_DIR) \
+	$(GORUN) -ldflags=$(DEBUG_LDFLAGS) $(PROJECT_DIR)/$(PROJECT_FILE)
 
 race-condition-dev: ## Run agent executable with race condition detection
 	@echo "🏎️ Running app with race condition detection enabled"
@@ -210,7 +217,12 @@ race-condition-dev: ## Run agent executable with race condition detection
 
 run-mock-management-grpc-server: ## Run mock management plane gRPC server
 	@echo "🖲️ Running mock management plane gRPC server"
-	$(GORUN) test/mock/grpc/cmd/main.go -configDirectory=$(MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY) -logLevel=$(MOCK_MANAGEMENT_PLANE_LOG_LEVEL) -grpcAddress=$(MOCK_MANAGEMENT_PLANE_GRPC_ADDRESS) -apiAddress=$(MOCK_MANAGEMENT_PLANE_API_ADDRESS) -externalFileServer=$(MOCK_MANAGEMENT_PLANE_EXTERNAL_FILE_SERVER)
+	$(GORUN) test/mock/grpc/cmd/main.go \
+		-configDirectory=$(MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY) \
+		-logLevel=$(MOCK_MANAGEMENT_PLANE_LOG_LEVEL) \
+		-grpcAddress=$(MOCK_MANAGEMENT_PLANE_GRPC_ADDRESS) \
+		-apiAddress=$(MOCK_MANAGEMENT_PLANE_API_ADDRESS) \
+		-externalFileServer=$(MOCK_MANAGEMENT_PLANE_EXTERNAL_FILE_SERVER)
 
 
 .PHONY: build-test-nginx-plus-and-nap-image