diff --git a/charts/agent/templates/deployment.yaml b/charts/agent/templates/deployment.yaml
index b584055..9a031d3 100755
--- a/charts/agent/templates/deployment.yaml
+++ b/charts/agent/templates/deployment.yaml
@@ -231,6 +231,12 @@ spec:
               value: {{ .Values.env.tracer.otel.insecure_skip_verify | quote }}
             - name: CONVOY_SENTRY_DSN
               value: {{ .Values.env.tracer.sentry.dsn | quote }}
+            - name: CONVOY_SENTRY_DEBUG
+              value: {{ .Values.env.tracer.sentry.debug | quote }}
+            {{- if .Values.env.tracer.sentry.environment }}
+            - name: CONVOY_SENTRY_ENVIRONMENT
+              value: {{ .Values.env.tracer.sentry.environment | quote }}
+            {{- end }}
             {{- end }}
 
             {{- if .Values.env.storage.enabled }}
diff --git a/charts/agent/values.yaml b/charts/agent/values.yaml
index fa499c4..e13210a 100755
--- a/charts/agent/values.yaml
+++ b/charts/agent/values.yaml
@@ -98,6 +98,8 @@ env:
       insecure_skip_verify: true
     sentry:
       dsn: ""
+      debug: false
+      environment: ""
   pyroscope:
     enabled: false
     url: ""
diff --git a/charts/server/templates/deployment.yaml b/charts/server/templates/deployment.yaml
index 929017b..dc39d13 100755
--- a/charts/server/templates/deployment.yaml
+++ b/charts/server/templates/deployment.yaml
@@ -91,7 +91,7 @@ spec:
             - name: HTTP_PROXY
               value: {{ .Values.env.proxy | quote }}
             - name: CONVOY_ENV
-              value: {{ .Values.env.environment | quote }}
+              value: {{ .Values.global.convoy.environment | quote }}
             - name: CONVOY_HOST
               value: {{ .Values.env.host | quote }}
             - name: CONVOY_ROOT_PATH
@@ -240,6 +240,12 @@ spec:
               value: {{ .Values.env.tracer.otel.insecure_skip_verify | quote }}
             - name: CONVOY_SENTRY_DSN
               value: {{ .Values.env.tracer.sentry.dsn | quote }}
+            - name: CONVOY_SENTRY_DEBUG
+              value: {{ .Values.env.tracer.sentry.debug | quote }}
+            {{- if .Values.env.tracer.sentry.environment }}
+            - name: CONVOY_SENTRY_ENVIRONMENT
+              value: {{ .Values.global.convoy.environment | quote }}
+            {{- end }}
             {{- end }}
 
             - name: CONVOY_INSTANCE_INGEST_RATE
diff --git a/charts/server/values.yaml b/charts/server/values.yaml
index 34780e0..9669f0f 100755
--- a/charts/server/values.yaml
+++ b/charts/server/values.yaml
@@ -18,6 +18,7 @@ global:
     portal_realm_enabled: false
     sentry_sample_rate: 1.0
     read_replica_dsn: ""
+    environment: ""
 
   externalDatabase:
     enabled: false
@@ -94,6 +95,8 @@ env:
       insecure_skip_verify: true
     sentry:
       dsn: ""
+      debug: false
+      environment: ""
   storage:
     enabled: false
     type: ""
@@ -187,8 +190,7 @@ podDisruptionBudget: {}
 #  minAvailable: 1
 
 # Extra environment variables to be set in the server pods
-extraEnvs:
-  []
+extraEnvs: []
   # - name: CUSTOM_ENV_VAR
   #   value: "custom_value"
   # - name: SECRET_ENV_VAR
diff --git a/values.yaml b/values.yaml
index fe4dc24..6ec74ba 100755
--- a/values.yaml
+++ b/values.yaml
@@ -30,7 +30,11 @@ global:
     otel_insecure_skip_verify: &otelInsecureSkipVerify true
     # -- Sentry DSN
     sentry_dsn: &sentryDsn ""
-    # -- Retention policy duration
+    # -- Sentry debug mode
+    sentry_debug: &sentryDebug false
+    # -- Sentry environment
+    sentry_environment: *environment
+
     retention_policy_duration: &retentionPolicyDuration 720h
     # -- Retention policy enabled
     retention_policy_enabled: &retentionPolicyEnabled false
@@ -196,6 +200,8 @@ agent:
         insecure_skip_verify: *otelInsecureSkipVerify
       sentry:
         dsn: *sentryDsn
+        debug: *sentryDebug
+        environment: *environment
     pyroscope:
       enabled: false
       url: ""
@@ -282,8 +288,7 @@ agent:
             periodSeconds: 60
         selectPolicy: Max
 
-  podDisruptionBudget:
-    {}
+  podDisruptionBudget: {}
     # -- Pod disruption budget
   #    maxUnavailable: 1
   #    minAvailable: 1
@@ -334,6 +339,8 @@ server:
         insecure_skip_verify: *otelInsecureSkipVerify
       sentry:
         dsn: *sentryDsn
+        debug: *sentryDebug
+        environment: *environment
     pyroscope:
       enabled: false
       url: ""
@@ -434,8 +441,7 @@ server:
             periodSeconds: 60
         selectPolicy: Max
 
-  podDisruptionBudget:
-    {}
+  podDisruptionBudget: {}
     # -- Pod disruption budget
   #    maxUnavailable: 1
   #    minAvailable: 1