diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index a1b2f8b..44bcacd 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -5,14 +5,33 @@ services:
     image: postgres:18
     container_name: postgres
     restart: unless-stopped
+    env_file:
+      - ../.env
     environment:
-      POSTGRES_DB: aips_db
-      POSTGRES_USER: user
-      POSTGRES_PASSWORD: secret
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     ports:
       - "5432:5432"
     volumes:
       - pgdata:/var/lib/postgresql
 
+  rabbitmq:
+    image: rabbitmq:3-management
+    container_name: rabbitmq
+    restart: unless-stopped
+    env_file:
+      - ../.env
+    environment:
+      RABBITMQ_DEFAULT_USER: ${RABBITMQ_DEFAULT_USER}
+      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_DEFAULT_PASS}
+      RABBITMQ_DEFAULT_VHOST: ${RABBITMQ_DEFAULT_VHOST}
+    ports:
+      - "5672:5672"      # AMQP
+      - "15672:15672"    # Management UI
+    volumes:
+      - rabbitmqdata:/var/lib/rabbitmq
+
 volumes:
-  pgdata:
\ No newline at end of file
+  pgdata:
+  rabbitmqdata:
diff --git a/dotnet/AipsWebApi/Program.cs b/dotnet/AipsWebApi/Program.cs
index 3629922..f6187c1 100644
--- a/dotnet/AipsWebApi/Program.cs
+++ b/dotnet/AipsWebApi/Program.cs
@@ -1,9 +1,8 @@
 using AipsCore.Infrastructure.DI;
-using AipsCore.Infrastructure.Persistence.Db;
 using AipsWebApi.Middleware;
 using DotNetEnv;
 
-Env.Load();
+Env.Load("../../.env");
 
 var builder = WebApplication.CreateBuilder(args);