diff --git a/.github/workflows/publish-on-merge.yml b/.github/workflows/publish-on-merge.yml
index b5e67f6f..8fa2dd65 100644
--- a/.github/workflows/publish-on-merge.yml
+++ b/.github/workflows/publish-on-merge.yml
@@ -157,7 +157,7 @@ jobs:
             - [ ] Merge when ready" \
               --base main \
               --head "chore/sync-version-${{ steps.version.outputs.version }}" \
-              --label "dependencies" \
+              --label "dependencies"
           fi
 
       - name: Create GitHub Release (prod only)
@@ -232,4 +232,4 @@ jobs:
           - [ ] Merge when ready" \
             --base main \
             --head "chore/bump-sdk-version-${{ steps.version.outputs.version }}" \
-            --label "dependencies" \
+            --label "dependencies"
diff --git a/package.json b/package.json
index 4202d9af..28d6627e 100644
--- a/package.json
+++ b/package.json
@@ -1,48 +1,48 @@
 {
-  "name": "@d-id/client-sdk",
-  "private": false,
-  "version": "1.1.6",
-  "type": "module",
-  "description": "d-id client sdk",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/de-id/agents-sdk"
-  },
-  "keywords": [
-    "d-id",
-    "sdk",
-    "client-sdk"
-  ],
-  "license": "MIT",
-  "author": "d-id",
-  "files": [
-    "dist/*"
-  ],
-  "main": "./dist/index.umd.cjs",
-  "module": "./dist/index.js",
-  "types": "./dist/src/index.d.ts",
-  "scripts": {
-    "dev": "vite",
-    "build": "node ./infra/build.js -m production",
-    "build:dev": "node ./infra/build.js -m development",
-    "dev:prod": "export NODE_ENV=production && vite --mode production",
-    "deploy:prod": "node ./infra/deploy.js --version beta",
-    "preview": "vite preview",
-    "test-build": "node .infra/build.js -m development",
-    "build:docs": "typedoc"
-  },
-  "devDependencies": {
-    "@preact/preset-vite": "^2.8.1",
-    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
-    "@types/node": "^22.15.0",
-    "commander": "^11.1.0",
-    "glob": "^10.3.10",
-    "preact": "^10.19.6",
-    "prettier": "^3.2.5",
-    "prettier-plugin-organize-imports": "^3.2.4",
-    "typedoc": "^0.25.7",
-    "typescript": "^5.3.3",
-    "vite": "^5.1.4",
-    "vite-plugin-dts": "^3.7.3"
-  }
+    "name": "@d-id/client-sdk",
+    "private": false,
+    "version": "1.1.6",
+    "type": "module",
+    "description": "d-id client sdk",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/de-id/agents-sdk"
+    },
+    "keywords": [
+        "d-id",
+        "sdk",
+        "client-sdk"
+    ],
+    "license": "MIT",
+    "author": "d-id",
+    "files": [
+        "dist/*"
+    ],
+    "main": "./dist/index.umd.cjs",
+    "module": "./dist/index.js",
+    "types": "./dist/src/index.d.ts",
+    "scripts": {
+        "dev": "vite",
+        "build": "node ./infra/build.js -m production",
+        "build:dev": "node ./infra/build.js -m development",
+        "dev:prod": "export NODE_ENV=production && vite --mode production",
+        "deploy:prod": "node ./infra/deploy.js --version beta",
+        "preview": "vite preview",
+        "test-build": "node .infra/build.js -m development",
+        "build:docs": "typedoc"
+    },
+    "devDependencies": {
+        "@preact/preset-vite": "^2.8.1",
+        "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+        "@types/node": "^22.15.0",
+        "commander": "^11.1.0",
+        "glob": "^10.3.10",
+        "preact": "^10.19.6",
+        "prettier": "^3.2.5",
+        "prettier-plugin-organize-imports": "^3.2.4",
+        "typedoc": "^0.25.7",
+        "typescript": "^5.3.3",
+        "vite": "^5.1.4",
+        "vite-plugin-dts": "^3.7.3"
+    }
 }
diff --git a/src/services/agent-manager/index.ts b/src/services/agent-manager/index.ts
index 944fa2c2..9be4f548 100644
--- a/src/services/agent-manager/index.ts
+++ b/src/services/agent-manager/index.ts
@@ -183,6 +183,9 @@ export async function createAgentManager(agent: string, options: AgentManagerOpt
                 chatId: items.chat?.id,
                 agentId: agentEntity.id,
                 mode: items.chatMode,
+                access: agentEntity.access,
+                name: agentEntity.preview_name,
+                ...(agentEntity.access === 'public' ? { from: 'agent-template' } : {}),
             });
         },
         async reconnect() {
@@ -194,6 +197,9 @@ export async function createAgentManager(agent: string, options: AgentManagerOpt
                 chatId: items.chat?.id,
                 agentId: agentEntity.id,
                 mode: items.chatMode,
+                access: agentEntity.access,
+                name: agentEntity.preview_name,
+                ...(agentEntity.access === 'public' ? { from: 'agent-template' } : {}),
             });
         },
         async disconnect() {
@@ -204,6 +210,9 @@ export async function createAgentManager(agent: string, options: AgentManagerOpt
                 chatId: items.chat?.id,
                 agentId: agentEntity.id,
                 mode: items.chatMode,
+                access: agentEntity.access,
+                name: agentEntity.preview_name,
+                ...(agentEntity.access === 'public' ? { from: 'agent-template' } : {}),
             });
         },
         async chat(userMessage: string) {
diff --git a/src/services/chat/index.ts b/src/services/chat/index.ts
index d0bce303..a767fa0e 100644
--- a/src/services/chat/index.ts
+++ b/src/services/chat/index.ts
@@ -22,9 +22,12 @@ export async function createChat(
 
             analytics.track('agent-chat', {
                 event: 'created',
-                chat_id: chat.id,
-                agent_id: agent.id,
+                chatId: chat.id,
+                agentId: agent.id,
                 mode: chatMode,
+                access: agent.access,
+                name: agent.preview_name,
+                ...(agent.access === 'public' ? { from: 'agent-template' } : {}),
             });
         }