diff --git a/src/server/trpc/util.ts b/src/server/trpc/util.ts
index 1076ac5..c42891e 100644
--- a/src/server/trpc/util.ts
+++ b/src/server/trpc/util.ts
@@ -78,11 +78,11 @@ export async function createContext(
     }
 
     if (
-      req.headers.__interval_organization_id &&
+      req.headers['x-interval-organization-id'] &&
       // For some reason undefined headers are being stringified instead of discarded during serialization
-      req.headers.__interval_organization_id !== 'undefined'
+      req.headers['x-interval-organization-id'] !== 'undefined'
     ) {
-      organizationId = String(req.headers.__interval_organization_id)
+      organizationId = String(req.headers['x-interval-organization-id'])
 
       req.session.currentOrganizationId = organizationId
       sessionUpdated = true
@@ -116,11 +116,11 @@ export async function createContext(
     }
 
     if (
-      req.headers.__interval_organization_environment_id &&
-      req.headers.__interval_organization_environment_id !== 'undefined'
+      req.headers['x-interval-organization-environment-id'] &&
+      req.headers['x-interval-organization-environment-id'] !== 'undefined'
     ) {
       organizationEnvironmentId =
-        req.headers.__interval_organization_environment_id?.toString()
+        req.headers['x-interval-organization-environment-id']?.toString()
       req.session.currentOrganizaitonEnvironmentId = organizationEnvironmentId
       sessionUpdated = true
     } else {
diff --git a/src/utils/trpc/index.ts b/src/utils/trpc/index.ts
index 44e8046..94f15e4 100644
--- a/src/utils/trpc/index.ts
+++ b/src/utils/trpc/index.ts
@@ -21,8 +21,8 @@ export const clientConfig = {
   headers() {
     return {
       // This is the ID for the current organization, set by DashboardContext
-      __interval_organization_id: window.__INTERVAL_ORGANIZATION_ID,
-      __interval_organization_environment_id:
+      'x-interval-organization-id': window.__INTERVAL_ORGANIZATION_ID,
+      'x-interval-organization-environment-id':
         window.__INTERVAL_ORGANIZATION_ENVIRONMENT_ID,
     }
   },