diff --git a/controlplane/src/core/composition/composeGraphs.worker.ts b/controlplane/src/core/composition/composeGraphs.worker.ts
index 8332df8b18..98de684225 100644
--- a/controlplane/src/core/composition/composeGraphs.worker.ts
+++ b/controlplane/src/core/composition/composeGraphs.worker.ts
@@ -11,6 +11,7 @@
  * is safe for local modules. Value imports from npm packages are fine.
  */
 import { randomUUID } from 'node:crypto';
+import os from 'node:os';
 import { printSchemaWithDirectives } from '@graphql-tools/utils';
 import {
   federateSubgraphsContract,
@@ -90,6 +91,8 @@ if (SENTRY_ENABLED && SENTRY_DSN) {
     enableLogs: SENTRY_ENABLE_LOGS,
     spotlight: process.env.NODE_ENV !== 'production',
   });
+
+  Sentry.setTag('hostname', os.hostname());
 }
 
 function parseGRPCMapping(mappings: string): GRPCMapping {
diff --git a/controlplane/src/core/sentry.config.ts b/controlplane/src/core/sentry.config.ts
index 03d0e42e78..732af45727 100644
--- a/controlplane/src/core/sentry.config.ts
+++ b/controlplane/src/core/sentry.config.ts
@@ -1,3 +1,4 @@
+import os from 'node:os';
 import process from 'node:process';
 import * as Sentry from '@sentry/node';
 import { nodeProfilingIntegration } from '@sentry/profiling-node';
@@ -33,6 +34,8 @@ if (SENTRY_ENABLED && SENTRY_DSN) {
     spotlight: process.env.NODE_ENV !== 'production',
   });
 
+  Sentry.setTag('hostname', os.hostname());
+
   if (process.env.NODE_ENV !== 'production') {
     console.log('Sentry is initialized.');
   }