diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index 707a0ce..5daff46 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -28,7 +28,11 @@
       "Bash(npm rebuild:*)",
       "Bash(npm uninstall:*)",
       "Bash(PGPASSWORD=xpeditis_password psql -h localhost -p 5432 -U xpeditis -d xpeditis_db -c \"SELECT id FROM organizations WHERE type = ''FREIGHT_FORWARDER'' LIMIT 1;\")",
-      "Bash(PGPASSWORD=xpeditis_dev_password psql -h localhost -p 5432 -U xpeditis -d xpeditis_dev -c \"SELECT id, name FROM organizations WHERE type = ''FREIGHT_FORWARDER'' LIMIT 1;\")"
+      "Bash(PGPASSWORD=xpeditis_dev_password psql -h localhost -p 5432 -U xpeditis -d xpeditis_dev -c \"SELECT id, name FROM organizations WHERE type = ''FREIGHT_FORWARDER'' LIMIT 1;\")",
+      "Bash(docker-compose:*)",
+      "Bash(npm run start:dev:*)",
+      "Bash(findstr:*)",
+      "Bash(taskkill:*)"
     ],
     "deny": [],
     "ask": []
diff --git a/apps/backend/src/app.module.ts b/apps/backend/src/app.module.ts
index ad6af8b..8f37640 100644
--- a/apps/backend/src/app.module.ts
+++ b/apps/backend/src/app.module.ts
@@ -78,9 +78,10 @@ import { CustomThrottlerGuard } from './application/guards/throttle.guard';
         username: configService.get('DATABASE_USER'),
         password: configService.get('DATABASE_PASSWORD'),
         database: configService.get('DATABASE_NAME'),
-        entities: [],
+        entities: [__dirname + '/**/*.orm-entity{.ts,.js}'],
         synchronize: configService.get('DATABASE_SYNC', false),
         logging: configService.get('DATABASE_LOGGING', false),
+        autoLoadEntities: true, // Auto-load entities from forFeature()
       }),
       inject: [ConfigService],
     }),
diff --git a/apps/backend/src/infrastructure/persistence/typeorm/migrations/1700000000000-EnableFuzzySearch.ts b/apps/backend/src/infrastructure/persistence/typeorm/migrations/1700000000000-EnableFuzzySearch.ts.disabled
similarity index 100%
rename from apps/backend/src/infrastructure/persistence/typeorm/migrations/1700000000000-EnableFuzzySearch.ts
rename to apps/backend/src/infrastructure/persistence/typeorm/migrations/1700000000000-EnableFuzzySearch.ts.disabled
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
new file mode 100644
index 0000000..ff6a393
--- /dev/null
+++ b/docker-compose.dev.yml
@@ -0,0 +1,41 @@
+services:
+  # PostgreSQL Database
+  postgres:
+    image: postgres:latest
+    container_name: xpeditis-postgres-dev
+    restart: unless-stopped
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_DB: xpeditis_dev
+      POSTGRES_USER: xpeditis
+      POSTGRES_PASSWORD: xpeditis_dev_password
+    volumes:
+      - postgres_data_dev:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U xpeditis"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+  # Redis Cache
+  redis:
+    image: redis:7
+    container_name: xpeditis-redis-dev
+    restart: unless-stopped
+    ports:
+      - "6379:6379"
+    command: redis-server --requirepass xpeditis_dev_password
+    volumes:
+      - redis_data_dev:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 3s
+      retries: 5
+
+volumes:
+  postgres_data_dev:
+    name: xpeditis_postgres_data_dev
+  redis_data_dev:
+    name: xpeditis_redis_data_dev