diff --git a/packages/twenty-server/scripts/setup-db.ts b/packages/twenty-server/scripts/setup-db.ts
index bfdf51133..cefc1245e 100644
--- a/packages/twenty-server/scripts/setup-db.ts
+++ b/packages/twenty-server/scripts/setup-db.ts
@@ -1,8 +1,10 @@
 import console from 'console';
 
-import { camelToSnakeCase, connectionSource, performQuery } from './utils';
+import { rawDataSource } from 'src/database/typeorm/raw/raw.datasource';
 
-connectionSource
+import { camelToSnakeCase, performQuery } from './utils';
+
+rawDataSource
   .initialize()
   .then(async () => {
     await performQuery(
diff --git a/packages/twenty-server/scripts/truncate-db.ts b/packages/twenty-server/scripts/truncate-db.ts
index 2e18a3e72..bc5b4feea 100644
--- a/packages/twenty-server/scripts/truncate-db.ts
+++ b/packages/twenty-server/scripts/truncate-db.ts
@@ -1,10 +1,12 @@
 import console from 'console';
 
-import { connectionSource, performQuery } from './utils';
+import { rawDataSource } from 'src/database/typeorm/raw/raw.datasource';
+
+import { performQuery } from './utils';
 
 async function dropSchemasSequentially() {
   try {
-    await connectionSource.initialize();
+    await rawDataSource.initialize();
 
     // Fetch all schemas
     const schemas = await performQuery(
diff --git a/packages/twenty-server/scripts/utils.ts b/packages/twenty-server/scripts/utils.ts
index 99dbd4b50..5786e7817 100644
--- a/packages/twenty-server/scripts/utils.ts
+++ b/packages/twenty-server/scripts/utils.ts
@@ -1,12 +1,6 @@
 import console from 'console';
 
-import { DataSource } from 'typeorm';
-
-export const connectionSource = new DataSource({
-  type: 'postgres',
-  logging: false,
-  url: process.env.PG_DATABASE_URL,
-});
+import { rawDataSource } from 'src/database/typeorm/raw/raw.datasource';
 
 export const camelToSnakeCase = (str) =>
   str.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
@@ -18,7 +12,7 @@ export const performQuery = async (
   ignoreAlreadyExistsError = false,
 ) => {
   try {
-    const result = await connectionSource.query(query);
+    const result = await rawDataSource.query(query);
 
     withLog && console.log(`Performed '${consoleDescription}' successfully`);
 
diff --git a/packages/twenty-server/src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service.ts b/packages/twenty-server/src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service.ts
index adc84e677..9be19725a 100644
--- a/packages/twenty-server/src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service.ts
+++ b/packages/twenty-server/src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service.ts
@@ -1,13 +1,12 @@
 import { Injectable } from '@nestjs/common';
 
-import { DataSource } from 'typeorm';
-
 import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 import { WorkspaceManagerService } from 'src/engine/workspace-manager/workspace-manager.service';
 import {
   deleteCoreSchema,
   seedCoreSchema,
 } from 'src/database/typeorm-seeds/core/demo';
+import { rawDataSource } from 'src/database/typeorm/raw/raw.datasource';
 
 @Injectable()
 export class DataSeedDemoWorkspaceService {
@@ -18,14 +17,7 @@ export class DataSeedDemoWorkspaceService {
 
   async seedDemo(): Promise<void> {
     try {
-      const dataSource = new DataSource({
-        url: this.environmentService.get('PG_DATABASE_URL'),
-        type: 'postgres',
-        logging: true,
-        schema: 'public',
-      });
-
-      await dataSource.initialize();
+      await rawDataSource.initialize();
       const demoWorkspaceIds =
         this.environmentService.get('DEMO_WORKSPACE_IDS');
 
@@ -35,10 +27,10 @@ export class DataSeedDemoWorkspaceService {
         );
       }
       for (const workspaceId of demoWorkspaceIds) {
-        await deleteCoreSchema(dataSource, workspaceId);
+        await deleteCoreSchema(rawDataSource, workspaceId);
         await this.workspaceManagerService.delete(workspaceId);
 
-        await seedCoreSchema(dataSource, workspaceId);
+        await seedCoreSchema(rawDataSource, workspaceId);
         await this.workspaceManagerService.initDemo(workspaceId);
       }
     } catch (error) {
diff --git a/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts b/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts
index e2fa521c3..0f127743b 100644
--- a/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts
+++ b/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts
@@ -1,5 +1,5 @@
 import { Command, CommandRunner } from 'nest-commander';
-import { DataSource, EntityManager } from 'typeorm';
+import { EntityManager } from 'typeorm';
 
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { seedCompanies } from 'src/database/typeorm-seeds/workspace/companies';
@@ -27,6 +27,7 @@ import { seedCalendarEvents } from 'src/database/typeorm-seeds/workspace/calenda
 import { seedCalendarChannels } from 'src/database/typeorm-seeds/workspace/calendar-channel';
 import { seedCalendarChannelEventAssociations } from 'src/database/typeorm-seeds/workspace/calendar-channel-event-association';
 import { seedCalendarEventParticipants } from 'src/database/typeorm-seeds/workspace/calendar-event-participants';
+import { rawDataSource } from 'src/database/typeorm/raw/raw.datasource';
 
 // TODO: implement dry-run
 @Command({
@@ -50,19 +51,12 @@ export class DataSeedWorkspaceCommand extends CommandRunner {
 
   async run(): Promise<void> {
     try {
-      const dataSource = new DataSource({
-        url: this.environmentService.get('PG_DATABASE_URL'),
-        type: 'postgres',
-        logging: true,
-        schema: 'core',
-      });
-
       for (const workspaceId of this.workspaceIds) {
-        await dataSource.initialize();
+        await rawDataSource.initialize();
 
-        await seedCoreSchema(dataSource, workspaceId);
+        await seedCoreSchema(rawDataSource, workspaceId);
 
-        await dataSource.destroy();
+        await rawDataSource.destroy();
 
         const schemaName =
           await this.workspaceDataSourceService.createWorkspaceDBSchema(
diff --git a/packages/twenty-server/src/database/typeorm/core/core.datasource.ts b/packages/twenty-server/src/database/typeorm/core/core.datasource.ts
index db0768432..6733370d0 100644
--- a/packages/twenty-server/src/database/typeorm/core/core.datasource.ts
+++ b/packages/twenty-server/src/database/typeorm/core/core.datasource.ts
@@ -21,6 +21,7 @@ export const typeORMCoreModuleOptions: TypeOrmModuleOptions = {
         }
       : undefined,
 };
+
 export const connectionSource = new DataSource(
   typeORMCoreModuleOptions as DataSourceOptions,
 );
diff --git a/packages/twenty-server/src/database/typeorm/raw/raw.datasource.ts b/packages/twenty-server/src/database/typeorm/raw/raw.datasource.ts
new file mode 100644
index 000000000..a50567c43
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/raw/raw.datasource.ts
@@ -0,0 +1,17 @@
+import { config } from 'dotenv';
+import { DataSource, DataSourceOptions } from 'typeorm';
+config();
+
+const typeORMRawModuleOptions: DataSourceOptions = {
+  url: process.env.PG_DATABASE_URL,
+  type: 'postgres',
+  logging: ['error'],
+  ssl:
+    process.env.PG_SSL_ALLOW_SELF_SIGNED === 'true'
+      ? {
+          rejectUnauthorized: false,
+        }
+      : undefined,
+};
+
+export const rawDataSource = new DataSource(typeORMRawModuleOptions);
diff --git a/packages/twenty-server/src/database/typeorm/typeorm.service.ts b/packages/twenty-server/src/database/typeorm/typeorm.service.ts
index c9a05a12a..a3cedb839 100644
--- a/packages/twenty-server/src/database/typeorm/typeorm.service.ts
+++ b/packages/twenty-server/src/database/typeorm/typeorm.service.ts
@@ -89,6 +89,11 @@ export class TypeORMService implements OnModuleInit, OnModuleDestroy {
         ? ['query', 'error']
         : ['error'],
       schema,
+      ssl: this.environmentService.get('PG_SSL_ALLOW_SELF_SIGNED')
+        ? {
+            rejectUnauthorized: false,
+          }
+        : undefined,
     });
 
     await workspaceDataSource.initialize();