diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5f7d4e0..436632b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -91,10 +91,11 @@ jobs:
           VS_MARKETPLACE_PAT: ${{ secrets.VS_MARKETPLACE_PAT }}
         run: |
           if (-not $env:VS_MARKETPLACE_PAT) { throw 'Secret VS_MARKETPLACE_PAT is not set' }
-          # VsixPublisher ships with the Microsoft.VSSDK.BuildTools package: restore it.
+          # VsixPublisher ships with the Microsoft.VSSDK.BuildTools package: restore it. Use the copy under bin\lib,
+          # which has its dependencies next to it (the one under bin crashes while initializing telemetry).
           msbuild SourceControlSwitcher/SourceControlSwitcher.csproj -t:Restore -v:minimal
           $publisher = Get-ChildItem "$env:USERPROFILE\.nuget\packages\microsoft.vssdk.buildtools" -Recurse -Filter VsixPublisher.exe |
-            Where-Object { $_.Directory.Name -eq 'bin' } | Sort-Object FullName -Descending | Select-Object -First 1
+            Where-Object { $_.Directory.Name -eq 'lib' } | Sort-Object FullName -Descending | Select-Object -First 1
           if (-not $publisher) { throw 'VsixPublisher.exe not found' }
           & $publisher.FullName publish `
             -payload 'release/target/Release/SourceControlSwitcher.vsix' `
diff --git a/SourceControlSwitcher/Manifest/source.extension.vsixmanifest b/SourceControlSwitcher/Manifest/source.extension.vsixmanifest
index b532720..82996c3 100644
--- a/SourceControlSwitcher/Manifest/source.extension.vsixmanifest
+++ b/SourceControlSwitcher/Manifest/source.extension.vsixmanifest
@@ -9,7 +9,7 @@
         <GettingStartedGuide>https://github.com/Ryadel/SourceControlSwitcher#readme</GettingStartedGuide>
         <ReleaseNotes>Resources\CHANGELOG.txt</ReleaseNotes>
         <Icon>Resources\Icon.png</Icon>
-        <Tags>Source Control, Source Code Control, Source Control Provider, Source Control Client, Git, SVN, Subversion, TFVC, Team Foundation, Perforce, Helix</Tags>
+        <Tags>Source Control;Source Code Control;Source Control Provider;Git;SVN;Subversion;TFVC;Team Foundation;Perforce;Helix</Tags>
     </Metadata>
     <Installation InstalledByMsi="false">
         <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,)">