diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000..3fddd5f4
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,16 @@
+### Pull Request Type
+
+🔮 Feature
+🐛 BugFix
+⚒️ Refactor
+🧹 Chore
+🔥 HotFix
+🚀 Release
+<leave only relevant line>
+
+### Description
+-
+
+### Reference Links
+-   [Asana]() <add link inside brackets or delete line>
+-   [DataDog]() <add link inside brackets or delete line>
diff --git a/.github/workflows/publish-on-merge.yml b/.github/workflows/publish-on-merge.yml
index 81236d87..5a1db44d 100644
--- a/.github/workflows/publish-on-merge.yml
+++ b/.github/workflows/publish-on-merge.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
     inputs:
       dry_run:
-        description: 'Run in dry-run mode (no actual publishing)'
+        description: "Run in dry-run mode (no actual publishing)"
         required: false
         default: false
         type: boolean
@@ -44,8 +44,8 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
-          registry-url: 'https://registry.npmjs.org'
-          cache: 'yarn'
+          registry-url: "https://registry.npmjs.org"
+          cache: "yarn"
 
       - name: Install dependencies
         run: |
@@ -236,6 +236,9 @@ jobs:
             exit 0
           fi
 
+          logger -l info -m "Installing dependencies to update yarn.lock"
+          yarn install
+
           logger -l info -m "Creating new branch"
           git checkout -b "chore/bump-sdk-version-${{ steps.version.outputs.version }}"
 
@@ -243,8 +246,8 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
-          logger -l info -m "Adding and committing package.json"
-          git add package.json
+          logger -l info -m "Adding and committing package.json and yarn.lock"
+          git add package.json yarn.lock
           git commit -m "chore: bump @d-id/client-sdk to v${{ steps.version.outputs.version }}"
 
           logger -l info -m "Publishing branch to origin"
diff --git a/src/services/streaming-manager/livekit-manager.ts b/src/services/streaming-manager/livekit-manager.ts
index 50f585f7..b0f178da 100644
--- a/src/services/streaming-manager/livekit-manager.ts
+++ b/src/services/streaming-manager/livekit-manager.ts
@@ -90,7 +90,7 @@ export async function createLiveKitStreamingManager<T extends CreateSessionV2Opt
 ): Promise<StreamingManager<T> & { reconnect(): Promise<void> }> {
     const log = createStreamingLogger(options.debug || false, 'LiveKitStreamingManager');
 
-    const { Room, RoomEvent, ConnectionState: LiveKitConnectionState } = await importLiveKit();
+    const { Room, RoomEvent, ConnectionState: LiveKitConnectionState, Track } = await importLiveKit();
 
     const { callbacks, auth, baseURL, analytics, microphoneStream } = options;
     let room: Room | null = null;
@@ -293,11 +293,11 @@ export async function createLiveKitStreamingManager<T extends CreateSessionV2Opt
         topic?: string
     ): void {
         const message = new TextDecoder().decode(payload);
-        log('Data received:', message);
 
         try {
             const data = JSON.parse(message);
             const subject = topic || data.subject;
+            log('Data received:', { subject, data });
 
             if (subject === StreamEvents.ChatAnswer) {
                 const eventName = ChatProgress.Answer;
@@ -311,14 +311,23 @@ export async function createLiveKitStreamingManager<T extends CreateSessionV2Opt
                     event: eventName,
                     ...data,
                 });
-            } else if ([StreamEvents.StreamVideoCreated, StreamEvents.StreamVideoDone].includes(subject)) {
+            } else if (
+                [
+                    StreamEvents.StreamVideoCreated,
+                    StreamEvents.StreamVideoDone,
+                    StreamEvents.StreamVideoError,
+                    StreamEvents.StreamVideoRejected,
+                ].includes(subject)
+            ) {
                 currentActivityState =
                     subject === StreamEvents.StreamVideoCreated ? AgentActivityState.Talking : AgentActivityState.Idle;
                 callbacks.onAgentActivityStateChange?.(currentActivityState);
 
-                const role = data?.role || participant?.identity || 'datachannel';
+                const { role: providedRole, status: providedStatus, ...payload } = data;
 
-                const messageData: VideoMessageData = { [role]: data };
+                const role = providedRole ?? participant?.identity ?? 'datachannel';
+                const status = providedStatus ?? subject.split('/').pop() ?? 'unknown';
+                const messageData: VideoMessageData = { [role]: { ...payload, status } };
 
                 if (options.debug && data?.metadata?.sentiment) {
                     messageData.sentiment = {
@@ -363,10 +372,9 @@ export async function createLiveKitStreamingManager<T extends CreateSessionV2Opt
         log('Track subscription failed:', { trackSid, participant, reason });
     }
 
-    async function findPublishedMicrophoneTrack(audioTrack: MediaStreamTrack): Promise<LocalTrackPublication | null> {
+    function findPublishedMicrophoneTrack(audioTrack: MediaStreamTrack): LocalTrackPublication | null {
         if (!room) return null;
 
-        const { Track } = await importLiveKit();
         const publishedTracks = room.localParticipant.audioTrackPublications;
 
         if (publishedTracks) {
@@ -409,9 +417,8 @@ export async function createLiveKitStreamingManager<T extends CreateSessionV2Opt
         }
 
         const audioTrack = audioTracks[0];
-        const { Track } = await importLiveKit();
 
-        const existingPublication = await findPublishedMicrophoneTrack(audioTrack);
+        const existingPublication = findPublishedMicrophoneTrack(audioTrack);
         if (existingPublication) {
             log('Microphone track is already published, skipping', {
                 trackId: audioTrack.id,