diff --git a/swh/templates/graphql/deployment.yaml b/swh/templates/graphql/deployment.yaml
index 4b69a0e..ca3ebf8 100644
--- a/swh/templates/graphql/deployment.yaml
+++ b/swh/templates/graphql/deployment.yaml
@@ -1,55 +1,68 @@
 {{ if .Values.graphql.enabled -}}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: graphql
   namespace: {{ .Values.namespace }}
   labels:
     app: graphql
 spec:
   replicas: {{ .Values.graphql.replicas }}
   selector:
     matchLabels:
       app: graphql
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: graphql
       annotations:
         # Force a rollout upgrade if the configuration changes
         checksum/config: {{ include (print $.Template.BasePath "/graphql/configmap.yaml") . | sha256sum }}
     spec:
       containers:
         - name: graphql
           image: {{ .Values.swh_graphql_image }}:{{ .Values.swh_graphql_image_version }}
           imagePullPolicy: Always
           ports:
             - containerPort: 5013
           env:
           - name: PORT
             value: "5013"
           - name: THREADS
             value: {{ .Values.graphql.gunicorn.threads | quote }}
           - name: WORKERS
             value: {{ .Values.graphql.gunicorn.workers | quote }}
           - name: LOG_LEVEL
             value: {{ .Values.graphql.logLevel | quote }}
           - name: TIMEOUT
             value: {{ .Values.graphql.gunicorn.timeout | quote }}
+          {{ if .Values.graphql.sentry_enabled -}}
+          - name: SWH_SENTRY_ENVIRONMENT
+            value: {{ $.Values.sentry.environment }}
+          - name: SWH_MAIN_PACKAGE
+            value: swh.graphql
+          - name: SWH_SENTRY_DSN
+            valueFrom:
+              secretKeyRef:
+                name: graphql-sentry-secrets
+                key: sentry-dsn
+                # 'name' secret must exist & include key "host"
+                optional: false
+          {{ end }}
           volumeMounts:
             - name: config
               mountPath: /etc/swh/config.yml
               subPath: config.yml
               readOnly: true
       volumes:
         - name: config
           configMap:
             name: graphql
             defaultMode: 0444
 
 {{ end }}
diff --git a/swh/values/staging.yaml b/swh/values/staging.yaml
index e101bba..ec1f86b 100644
--- a/swh/values/staging.yaml
+++ b/swh/values/staging.yaml
@@ -1,136 +1,137 @@
 sentry:
   environment: staging
 
 loaders:
   enabled: true
   storage:
     host: storage1.internal.staging.swh.network
     port: 5002
   amqp:
     host: scheduler0.internal.staging.swh.network
   deployments:
     # bzr:
     #   requestedMemory: 256Mi
     #   requestedCpu: 200m
     #   queues:
     #     - swh.loader.bzr.tasks.LoadBazaar
     #   autoScaling:
     #     queueThreshold: 10
     #     minReplicacount: 1
     #     maxReplicaCount: 3
     #   sentrySwhPackage: swh.loader.bzr
     # cvs:
     #   requestedMemory: 256Mi
     #   requestedCpu: 200m
     #   queues:
     #     - swh.loader.cvs.tasks.LoadCvsRepository
     #   autoScaling:
     #     queueThreshold: 10
     #     minReplicacount: 1
     #     maxReplicaCount: 3
     #   sentrySwhPackage: swh.loader.cvs
     # hg:
     #   requestedMemory: 256Mi
     #   requestedCpu: 200m
     #   queues:
     #     - swh.loader.mercurial.tasks.LoadArchiveMercurial
     #     - swh.loader.mercurial.tasks.LoadMercurial
     #   autoScaling:
     #     queueThreshold: 10
     #     minReplicacount: 1
     #     maxReplicaCount: 3
     #   sentrySwhPackage: swh.loader.mercurial
     highpriority:
       requestedMemory: 256Mi
       requestedCpu: 200m
       queues:
         - save_code_now:swh.loader.bzr.tasks.LoadBazaar
         - save_code_now:swh.loader.git.tasks.UpdateGitRepository
         - save_code_now:swh.loader.git.tasks.LoadDiskGitRepository
         - save_code_now:swh.loader.git.tasks.UncompressAndLoadDiskGitRepository
         - save_code_now:swh.loader.mercurial.tasks.LoadArchiveMercurial
         - save_code_now:swh.loader.mercurial.tasks.LoadMercurial
         - save_code_now:swh.loader.svn.tasks.LoadSvnRepository
         - save_code_now:swh.loader.svn.tasks.MountAndLoadSvnRepository
         - save_code_now:swh.loader.svn.tasks.DumpMountAndLoadSvnRepository
         - save_code_now:swh.loader.package.archive.tasks.LoadArchive
       autoScaling:
         queueThreshold: 10
         minReplicacount: 0
         maxReplicaCount: 3
       sentrySwhPackage: swh.loader.highpriority
     git:
       requestedMemory: 256Mi
       requestedCpu: 200m
       queues:
         - swh.loader.git.tasks.UpdateGitRepository
         - swh.loader.git.tasks.LoadDiskGitRepository
         - swh.loader.git.tasks.UncompressAndLoadDiskGitRepository
       autoScaling:
         queueThreshold: 5  # spawn worker per increment of `value` messages
         minReplicacount: 1
         maxReplicaCount: 3
       sentrySwhPackage: swh.loader.git
     # maven:
     #   requestedMemory: 256Mi
     #   requestedCpu: 200m
     #   queues:
     #     - swh.loader.package.maven.tasks.LoadMaven
     #   autoScaling:
     #     queueThreshold: 10
     #     minReplicacount: 1
     #     maxReplicaCount: 3
     #   sentrySwhPackage: swh.loader.core
     # npm:
     #   requestedMemory: 256Mi
     #   requestedCpu: 200m
     #   queues:
     #     - swh.loader.package.npm.tasks.LoadNpm
     #   autoScaling:
     #     queueThreshold: 10
     #     minReplicacount: 1
     #     maxReplicaCount: 3
     #   sentrySwhPackage: swh.loader.core
     # pypi:
     #   requestedMemory: 256Mi
     #   requestedCpu: 200m
     #   queues:
     #     - swh.loader.package.pypi.tasks.LoadPyPI
     #   autoScaling:
     #     queueThreshold: 10
     #     minReplicacount: 1
     #     maxReplicaCount: 3
     #   sentrySwhPackage: swh.loader.core
     # svn:
     #   requestedMemory: 256Mi
     #   requestedCpu: 200m
     #   queues:
     #     - swh.loader.svn.tasks.LoadSvnRepository
     #     - swh.loader.svn.tasks.MountAndLoadSvnRepository
     #     - swh.loader.svn.tasks.DumpMountAndLoadSvnRepository
     #   autoScaling:
     #     queueThreshold: 10
     #     minReplicacount: 1
     #     maxReplicaCount: 3
     #   sentrySwhPackage: swh.loader.svn
 
 graphql:
   enabled: true
+  sentry_enabled: true
   backends:
     storage:
       host: webapp.internal.staging.swh.network
       port: 5002
     search:
       host: search0.internal.staging.swh.network
       port: 5010
   replicas: 1
   gunicorn:
     threads: 4
     workers: 2
     timeout: 3600
   ingress:
     enabled: true
     httpPath: /
     host: graphql.staging.swh.network
   logLevel: DEBUG