diff --git a/.dev/.mk/migratioin.mk b/.dev/.mk/migratioin.mk
index fc8fcdf..c217f82 100644
--- a/.dev/.mk/migratioin.mk
+++ b/.dev/.mk/migratioin.mk
@@ -1,14 +1,15 @@
-migrate-up: ## Migrate seo db to the most recent version available
-	docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "host=qrcode-postgres port=5432 user=admin password=admin dbname=qrcode sslmode=disable" up'
+DB_DSN=host=$(DB_HOST) port=$(DB_PORT) user=$(DB_USER) password=$(DB_PASSWORD) dbname=$(DB_NAME) sslmode=disable
+migrate-up: ## Migrate db to latest version
+	docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "$(DB_DSN)" up'
 
 migrate-down:
-	docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "host=qrcode-postgres port=5432 user=admin password=admin dbname=qrcode sslmode=disable" down'
+	docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "$(DB_DSN)" down'
 
 migrate-reset:
-	docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "host=qrcode-postgres port=5432 user=admin password=admin dbname=qrcode sslmode=disable" reset'
+	docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "$(DB_DSN)" reset'
 
 migrate-status:
-	docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "host=qrcode-postgres port=5432 user=admin password=admin dbname=qrcode sslmode=disable" status'
+	docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "$(DB_DSN)" status'
 
 migrate-create:
 	docker compose exec qrcode-app sh -c 'goose -dir ./migrations create ${ARGS} sql'
diff --git a/.dev/.mk/system.mk b/.dev/.mk/system.mk
index da68053..0ef403e 100644
--- a/.dev/.mk/system.mk
+++ b/.dev/.mk/system.mk
@@ -7,19 +7,19 @@ build-no-cache: ## build project
 	docker compose build --no-cache
 
 install: ## install the project
-	docker compose up -d
+	$(MAKE) up
 	echo "waiting db up..."
 	sleep 5
 	echo "migrate db"
-	docker compose exec qrcode-app sh -c 'goose -dir ./migrations postgres "host=qrcode-postgres port=5432 user=admin password=admin dbname=qrcode sslmode=disable" up'
+	$(MAKE) migrate-up
 	echo "install go requarements"
-	docker compose exec qrcode-app sh -c "go mod tidy"
-	docker compose exec qrcode-app sh -c "go mod vendor"
+	$(MAKE) app-tidy
+	$(MAKE) app-vendor
 	echo "install nodejs requarements"
 	docker compose run qrcode-front sh -c 'npm install'
-	docker compose stop
+	$(MAKE) stop 
 	echo "start the project"
-	docker compose up --remove-orphans
+	$(MAKE) watch
 
 up: ## start project
 	docker compose up -d --remove-orphans
diff --git a/Makefile b/Makefile
index 23bdc53..4db9ab2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ SHELL := /bin/bash
 MAKEFLAGS += --silent
 ARGS = $(filter-out $@,$(MAKECMDGOALS))
 
+include ./app/.env
+export
+
 .default: help
 
 export UID=$(shell id -u)