diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index af53c1115..4cd3562a9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -367,8 +367,6 @@ jobs:
 
       - name: Create jetsocat ZIP files for winget
         run: |
-          Set-PSDebug -Trace 1
-
           $Version = "${{ needs.preflight.outputs.version }}"
           $ZipFolder = "jetsocat-zips"
           New-Item -ItemType Directory -Path $ZipFolder -Force
@@ -418,6 +416,17 @@ jobs:
               Write-Warning "Could not find binary for $OS $Arch"
             }
           }
+
+          # Rename macOS universal binary to follow the naming convention (without version).
+          Get-ChildItem -Recurse -Filter "jetsocat_*_${Version}_universal" -File | ForEach-Object {
+            Rename-Item -Path $_.FullName -NewName "jetsocat-macos-universal"
+          }
+
+          # Rename Windows PDB files to follow the naming convention (without version).
+          Get-ChildItem -Recurse -Filter "jetsocat_Windows_${Version}_*.pdb" -File | ForEach-Object {
+            $Arch = $_.BaseName -replace "jetsocat_Windows_${Version}_", ""
+            Rename-Item -Path $_.FullName -NewName "jetsocat-windows-$Arch.pdb"
+          }
         shell: pwsh
 
       - name: Create GitHub release