diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 6c54879d..98814d89 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -4,12 +4,12 @@ on:
     branches:
       - master
       - beta
-      - angular-18
+      - v5
   pull_request:
     branches:
       - master
       - beta
-      - angular-18
+      - v5
 jobs:
   workflow:
     runs-on: ubuntu-latest
@@ -45,13 +45,6 @@ jobs:
       - name: Unit tests
         run: |
           npm run test:ci
-      # - name: E2e tests
-      #   env:
-      #     STREAM_API_KEY: ${{ secrets.API_KEY }}
-      #     STREAM_USER_ID: ${{ secrets.USER_ID }}
-      #     STREAM_USER_TOKEN: ${{ secrets.USER_TOKEN }}
-      #   run: |
-      #     npm run e2e:ci
       - name: Release
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -66,17 +59,17 @@ jobs:
           STREAM_USER_ID: <dynamic user>
           STREAM_CHANNELS_FILTER: '{"type": "messaging"}'
         run: >
-          yarn vercel pull --yes --environment=${{ github.ref == 'refs/heads/master' && 'production' || 'preview' }} --token=${{ secrets.VERCEL_TOKEN }} &&
-          yarn vercel build ${{ github.ref == 'refs/heads/master' && '--prod' || '' }} --token=${{ secrets.VERCEL_TOKEN }} &&
-          yarn vercel deploy ${{ github.ref == 'refs/heads/master' && '--prod' || '' }} --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
+          yarn vercel pull --yes --environment=${{ github.ref == 'refs/heads/v5' && 'production' || 'preview' }} --token=${{ secrets.VERCEL_TOKEN }} &&
+          yarn vercel build ${{ github.ref == 'refs/heads/v5' && '--prod' || '' }} --token=${{ secrets.VERCEL_TOKEN }} &&
+          yarn vercel deploy ${{ github.ref == 'refs/heads/v5' && '--prod' || '' }} --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
       - name: Copy docs from stream-chat-css
-        run: npm run ${{ (github.ref == 'refs/heads/beta' || contains(github.head_ref, 'beta')) && 'copy-css-docs:v5' || 'copy-css-docs' }}
+        run: npm run ${{ (github.ref == 'refs/heads/v5' || contains(github.head_ref, 'v5')) && 'copy-css-docs:v5' || 'copy-css-docs' }}
       - name: Generate docs
         run: |
-          npm run ${{ (github.ref == 'refs/heads/beta' || contains(github.head_ref, 'beta')) && 'generate-docs:v5' || 'generate-docs' }}
+          npm run ${{ (github.ref == 'refs/heads/v5' || contains(github.head_ref, 'v5')) && 'generate-docs:v5' || 'generate-docs' }}
       - name: Push to docusaurus
         uses: GetStream/push-stream-chat-docusaurus-action@main
         with:
-          target-branch: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/beta') && 'production' || 'staging' }}
+          target-branch: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/v5') && 'production' || 'staging' }}
         env:
           DOCUSAURUS_GH_TOKEN: ${{ secrets.DOCUSAURUS_GH_TOKEN }}
diff --git a/projects/stream-chat-angular/src/lib/message-input/autocomplete-textarea/autocomplete-textarea.component.spec.ts b/projects/stream-chat-angular/src/lib/message-input/autocomplete-textarea/autocomplete-textarea.component.spec.ts
index 2600715d..c7461d1d 100644
--- a/projects/stream-chat-angular/src/lib/message-input/autocomplete-textarea/autocomplete-textarea.component.spec.ts
+++ b/projects/stream-chat-angular/src/lib/message-input/autocomplete-textarea/autocomplete-textarea.component.spec.ts
@@ -245,7 +245,7 @@ describe('AutocompleteTextareaComponent', () => {
         },
         '@'
       )
-    ).toBe('@Jack');
+    ).toBe('@Jack ');
   });
 
   it('should update mentioned users if sent is triggered', () => {
diff --git a/projects/stream-chat-angular/src/lib/message-input/autocomplete-textarea/autocomplete-textarea.component.ts b/projects/stream-chat-angular/src/lib/message-input/autocomplete-textarea/autocomplete-textarea.component.ts
index 67067c3b..e64b48ab 100644
--- a/projects/stream-chat-angular/src/lib/message-input/autocomplete-textarea/autocomplete-textarea.component.ts
+++ b/projects/stream-chat-angular/src/lib/message-input/autocomplete-textarea/autocomplete-textarea.component.ts
@@ -221,11 +221,7 @@ export class AutocompleteTextareaComponent
       this.mentionedUsers.push((item.user ? item.user : item) as UserResponse);
       this.userMentions.next([...this.mentionedUsers]);
     }
-    return (
-      triggerChar +
-      item.autocompleteLabel +
-      (triggerChar === this.commandTriggerChar ? ' ' : '')
-    );
+    return triggerChar + item.autocompleteLabel + ' ';
   }
 
   autcompleteSearchTermChanged(searchTerm: string) {