diff --git a/.dockerignore b/Docker/.dockerignore
similarity index 100%
rename from .dockerignore
rename to Docker/.dockerignore
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index ade55a8..240cf50 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -3,7 +3,6 @@ FROM python:3.11-slim
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
 
-
 WORKDIR /app
 
 COPY ./requirements.txt .
diff --git a/Docker/docker-compose.yaml b/Docker/docker-compose.yaml
index 5d0f4ca..771b901 100644
--- a/Docker/docker-compose.yaml
+++ b/Docker/docker-compose.yaml
@@ -4,19 +4,15 @@ services:
   brunix-engine:
     build: .
     container_name: brunix-assistance-engine
-    volumes:
-      - .:/workspace
-    env_file: .env
     ports:
       - "50052:50051"
     environment:
-      - ELASTICSEARCH_URL=http://host.docker.internal:9200
-      - DATABASE_URL=postgresql://postgres:brunix_pass@host.docker.internal:5432/postgres
-
-      - LANGFUSE_HOST=http://45.77.119.180
-      - LANGFUSE_PUBLIC_KEY=${LANGFUSE_PUBLIC_KEY}
-      - LANGFUSE_SECRET_KEY=${LANGFUSE_SECRET_KEY}
-      - LLM_BASE_URL=http://host.docker.internal:11434
+      ELASTICSEARCH_URL: ${ELASTICSEARCH_URL}
+      DATABASE_URL: ${DATABASE_URL}
+      LLM_BASE_URL: ${LLM_BASE_URL}
+      LANGFUSE_HOST: ${LANGFUSE_HOST}
+      LANGFUSE_PUBLIC_KEY: ${LANGFUSE_PUBLIC_KEY}
+      LANGFUSE_SECRET_KEY: ${LANGFUSE_SECRET_KEY}
     
     extra_hosts:
       - "host.docker.internal:host-gateway"
diff --git a/Makefile b/Makefile
index c678e67..3b3ca0d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,5 +18,5 @@ tunnels_up:
 compose_up:
 	bash ./scripts/start-tunnels.sh < /dev/null &
 	sleep 2
-	docker compose -f Docker/docker-compose.yaml up -d --build
+	docker compose -f Docker/docker-compose.yaml --env-file .env up -d --build
 	@echo "✓ Done!"