diff --git a/packages/services/evolution-service/src/app.module.ts b/packages/services/evolution-service/src/app.module.ts
index 0a65bdf..25ccff2 100644
--- a/packages/services/evolution-service/src/app.module.ts
+++ b/packages/services/evolution-service/src/app.module.ts
@@ -19,11 +19,11 @@ import { HealthModule } from './health/health.module';
       inject: [ConfigService],
       useFactory: (config: ConfigService) => ({
         type: 'postgres',
-        host: config.get('DB_HOST', 'localhost'),
-        port: config.get('DB_PORT', 5432),
-        username: config.get('DB_USER', 'iconsulting'),
-        password: config.get('DB_PASSWORD', 'iconsulting_dev'),
-        database: config.get('DB_NAME', 'iconsulting'),
+        host: config.get('POSTGRES_HOST', 'localhost'),
+        port: config.get<number>('POSTGRES_PORT', 5432),
+        username: config.get('POSTGRES_USER', 'postgres'),
+        password: config.get('POSTGRES_PASSWORD'),
+        database: config.get('POSTGRES_DB', 'iconsulting'),
         autoLoadEntities: true,
         synchronize: config.get('NODE_ENV') !== 'production',
         logging: config.get('NODE_ENV') === 'development',
diff --git a/packages/services/knowledge-service/src/app.module.ts b/packages/services/knowledge-service/src/app.module.ts
index 7615236..c118921 100644
--- a/packages/services/knowledge-service/src/app.module.ts
+++ b/packages/services/knowledge-service/src/app.module.ts
@@ -19,11 +19,11 @@ import { HealthModule } from './health/health.module';
       inject: [ConfigService],
       useFactory: (config: ConfigService) => ({
         type: 'postgres',
-        host: config.get('DB_HOST', 'localhost'),
-        port: config.get('DB_PORT', 5432),
-        username: config.get('DB_USER', 'iconsulting'),
-        password: config.get('DB_PASSWORD', 'iconsulting_dev'),
-        database: config.get('DB_NAME', 'iconsulting'),
+        host: config.get('POSTGRES_HOST', 'localhost'),
+        port: config.get<number>('POSTGRES_PORT', 5432),
+        username: config.get('POSTGRES_USER', 'postgres'),
+        password: config.get('POSTGRES_PASSWORD'),
+        database: config.get('POSTGRES_DB', 'iconsulting'),
         autoLoadEntities: true,
         synchronize: config.get('NODE_ENV') !== 'production',
         logging: config.get('NODE_ENV') === 'development',