diff --git a/src/note/note.service.ts b/src/note/note.service.ts
index dd65852..2a20ece 100644
--- a/src/note/note.service.ts
+++ b/src/note/note.service.ts
@@ -44,7 +44,7 @@ export async function createNote(
         orgs.push({ orgId: obj.client.toString(), taggedAt: new Date() });
         noteContent = noteContent.replaceAll(
           "{{client}}",
-          `{{${obj.client.toString()}}}`,
+          `{{org-${obj.client.toString()}}}`,
         );
       }
 
@@ -52,7 +52,7 @@ export async function createNote(
         orgs.push({ orgId: process.env.SUNCOAST_ID, taggedAt: new Date() });
         noteContent = noteContent.replaceAll(
           "{{agent}}",
-          `{{${process.env.SUNCOAST_ID}}}`,
+          `{{org-${process.env.SUNCOAST_ID}}}`,
         );
       }
     });