diff --git a/packages/twenty-docs/docs/start/self-hosting/self-hosting.mdx b/packages/twenty-docs/docs/start/self-hosting/self-hosting.mdx
index 78bc01573..936e67577 100644
--- a/packages/twenty-docs/docs/start/self-hosting/self-hosting.mdx
+++ b/packages/twenty-docs/docs/start/self-hosting/self-hosting.mdx
@@ -152,7 +152,10 @@ import TabItem from '@theme/TabItem';
     ['LOGGER_IS_BUFFER_ENABLED', 'true', 'Buffer the logs before sending them to the logging driver'],
     ['LOG_LEVELS', 'error,warn', "The loglevels which are logged to the logging driver. Can include: 'log', 'warn', 'error'"],
     ['EXCEPTION_HANDLER_DRIVER', 'sentry', "The exception handler driver can be: 'console' or 'sentry'"],
+    ['SENTRY_ENVIRONMENT', 'main', 'The sentry environment used if sentry logging driver is selected'],
+    ['SENTRY_RELEASE', 'latest', 'The sentry release used if sentry logging driver is selected'],
     ['SENTRY_DSN', 'https://xxx@xxx.ingest.sentry.io/xxx', 'The sentry logging endpoint used if sentry logging driver is selected'],
+    ['SENTRY_FRONT_DSN', 'https://xxx@xxx.ingest.sentry.io/xxx', 'The sentry logging endpoint used by the frontend if sentry logging driver is selected'],
     ]}></OptionTable>
 
 
diff --git a/packages/twenty-server/.env.example b/packages/twenty-server/.env.example
index 133630538..1c3bf3ead 100644
--- a/packages/twenty-server/.env.example
+++ b/packages/twenty-server/.env.example
@@ -39,7 +39,10 @@ SIGN_IN_PREFILLED=true
 # LOGGER_DRIVER=console
 # LOGGER_IS_BUFFER_ENABLED=true
 # EXCEPTION_HANDLER_DRIVER=sentry
+# SENTRY_ENVIRONMENT=main
+# SENTRY_RELEASE=latest
 # SENTRY_DSN=https://xxx@xxx.ingest.sentry.io/xxx
+# SENTRY_FRONT_DSN=https://xxx@xxx.ingest.sentry.io/xxx
 # LOG_LEVELS=error,warn
 # MESSAGE_QUEUE_TYPE=pg-boss
 # REDIS_HOST=127.0.0.1
diff --git a/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts
index 158c715a3..8338493e1 100644
--- a/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts
@@ -41,7 +41,7 @@ export class ClientConfigResolver {
       sentry: {
         environment: this.environmentService.get('SENTRY_ENVIRONMENT'),
         release: this.environmentService.get('SENTRY_RELEASE'),
-        dsn: this.environmentService.get('SENTRY_DSN_FRONT'),
+        dsn: this.environmentService.get('SENTRY_FRONT_DSN'),
       },
     };
 
diff --git a/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts b/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts
index fce188010..dc2df8ed3 100644
--- a/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts
+++ b/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts
@@ -235,7 +235,7 @@ export class EnvironmentVariables {
     (env) => env.EXCEPTION_HANDLER_DRIVER === ExceptionHandlerDriver.Sentry,
   )
   @IsString()
-  SENTRY_DSN_FRONT: string;
+  SENTRY_FRONT_DSN: string;
 
   @ValidateIf(
     (env) => env.EXCEPTION_HANDLER_DRIVER === ExceptionHandlerDriver.Sentry,
diff --git a/packages/twenty-server/src/engine/integrations/exception-handler/drivers/sentry.driver.ts b/packages/twenty-server/src/engine/integrations/exception-handler/drivers/sentry.driver.ts
index 302055bcb..1ece102d3 100644
--- a/packages/twenty-server/src/engine/integrations/exception-handler/drivers/sentry.driver.ts
+++ b/packages/twenty-server/src/engine/integrations/exception-handler/drivers/sentry.driver.ts
@@ -14,6 +14,7 @@ export class ExceptionHandlerSentryDriver
 {
   constructor(options: ExceptionHandlerSentryDriverFactoryOptions['options']) {
     Sentry.init({
+      environment: options.environment,
       release: options.release,
       dsn: options.dsn,
       integrations: [
@@ -25,7 +26,6 @@ export class ExceptionHandlerSentryDriver
       ],
       tracesSampleRate: 0.1,
       profilesSampleRate: 0.3,
-      environment: options.debug ? 'development' : 'production',
       debug: options.debug,
     });
   }