diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index fe22306a9..db5b79ca6 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -244,8 +244,8 @@ jobs:
         if: matrix.os == 'windows' && (matrix.project == 'devolutions-gateway' || matrix.project == 'devolutions-agent')
         uses: microsoft/setup-msbuild@v2
 
-      - name: Regenerate MSI
-        if: (matrix.project == 'devolutions-gateway' || matrix.project == 'devolutions-agent') && matrix.os == 'windows'
+      - name: Regenerate Gateway MSI
+        if: matrix.project == 'devolutions-gateway' && matrix.os == 'windows'
         shell: pwsh
         run: |
           $PackageRoot = Join-Path ${{ runner.temp }} ${{ matrix.project}}
@@ -257,7 +257,20 @@ jobs:
             Remove-Item $_.FullName -Force
           }
 
-          ./ci/tlk.ps1 package -PackageOption generate
+          ./ci/tlk.ps1 package -Product gateway -PackageOption generate
+
+      - name: Regenerate Agent MSI
+        if: matrix.project == 'devolutions-agent') && matrix.os == 'windows'
+        shell: pwsh
+        run: |
+          $PackageRoot = Join-Path ${{ runner.temp }} ${{ matrix.project}}
+          $Env:DAGENT_EXECUTABLE = Get-ChildItem -Path $PackageRoot -Recurse -Include '*DevolutionsAgent*.exe' | Select -First 1
+
+          Get-ChildItem -Path (Join-Path $PackageRoot PowerShell "*.zip") -Recurse | % {
+            Remove-Item $_.FullName -Force
+          }
+
+          ./ci/tlk.ps1 package -Product agent -PackageOption generate
 
       - name: Sign msi runtime
         if: (matrix.project == 'devolutions-gateway' || matrix.project == 'devolutions-agent') && matrix.os == 'windows'
@@ -298,6 +311,11 @@ jobs:
         if: (matrix.project == 'devolutions-gateway' || matrix.project == 'devolutions-agent') && matrix.os == 'windows'
         shell: pwsh
         run: |
+          $ContentDescription = switch ('${{ matrix.project }}') {
+            'devolutions-gateway' { 'Devolutions Gateway' }
+            'devolutions-agent' { 'Devolutions Agent' }
+          }
+
           Get-ChildItem -Path ${{ runner.temp }} -Recurse -Include '*.msi' | % {
             $Params = @('sign',
               '-kvt', '${{ secrets.AZURE_TENANT_ID }}',
@@ -306,7 +324,7 @@ jobs:
               '-kvs', '${{ secrets.CODE_SIGNING_CLIENT_SECRET }}',
               '-kvc', '${{ secrets.CODE_SIGNING_CERTIFICATE_NAME }}',
               '-tr', '${{ vars.CODE_SIGNING_TIMESTAMP_SERVER }}',
-              '-d', 'Devolutions Gateway',
+              '-d', $ContentDescription,
               '-v')
             AzureSignTool @Params $_.FullName
           }