diff --git a/Makefile b/Makefile
index 2e7d27d..2a41952 100644
--- a/Makefile
+++ b/Makefile
@@ -8,20 +8,26 @@ reset_docker:
 	docker rm -vf migrate
 
 backend_build:
-	make network; \
-	make postgres; \
-	docker rm -vf df; \
-	docker rmi -f df:latest; \
-	docker rmi -f docker.io/library/golang:1.21-alpine3.18; \
-	docker build -t df:latest -f bff/Dockerfile; \
-	docker exec -it postgres createdb --username=root --owner=root df; \
+	make network
+	make postgres
+	docker rm -vf df
+	docker rmi -f df:latest
+	docker rmi -f docker.io/library/golang:1.21-alpine3.18
+	docker build -t df:latest -f bff/Dockerfile
+	docker exec -it postgres createdb --username=root --owner=root df
 	docker run --name migrateup --rm --privileged=true -v $(PWD)/bff/db/migration:/migrations --network host migrate/migrate -path=/migrations/ -database $(DB_URL) up
 
 backend:
-	docker start postgres; docker rm -vf df; docker run --name df --rm -p 8080:8080 -p 9090:9090 --network df-network -d df:latest
+	docker-compose -f ./bff/docker-compose.yaml -p df-bff up -d
 
-backend-stop:
-	docker stop postgres; docker stop df
+stop-backend:
+	docker-compose -f ./bff/docker-compose.yaml -p df-bff down
+
+dev:
+	make network
+	make postgres
+	make createdb
+	make migrateup
 
 network:
 	docker network create df-network
diff --git a/bff/docker-compose.yaml b/bff/docker-compose.yaml
new file mode 100644
index 0000000..6e1f2c6
--- /dev/null
+++ b/bff/docker-compose.yaml
@@ -0,0 +1,24 @@
+version: "3.9"
+services:
+  postgres:
+    image: postgres:15-alpine
+    environment:
+      - POSTGRES_USER=root
+      - POSTGRES_PASSWORD=secret
+      - POSTGRES_DB=df
+    ports:
+      - "5432:5432"
+    volumes: 
+      - ./db/migration:/docker-entrypoint-initdb.d
+  api:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8080:8080"
+      - "9090:9090"
+    environment:
+      - DB_SOURCE=postgresql://root:secret@postgres:5432/df?sslmode=disable
+    depends_on:
+      - postgres
+    command: [ "/app/main" ]