diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml
index 6934c2523..b6034442d 100644
--- a/.github/workflows/winget.yml
+++ b/.github/workflows/winget.yml
@@ -38,14 +38,15 @@ jobs:
         run: |
           $tag = "v${{ steps.version.outputs.version }}"
           $baseUrl = "https://github.com/${{ github.repository }}/releases/download/$tag"
+          $repoUrl = "https://github.com/${{ github.repository }}"
           
           # Download and hash x64
-          $x64Url = "$baseUrl/cortex-windows-x64.zip"
+          $x64Url = "$baseUrl/cortex-cli-windows-x64.zip"
           Invoke-WebRequest -Uri $x64Url -OutFile "cortex-x64.zip" -ErrorAction Stop
           $x64Hash = (Get-FileHash -Path "cortex-x64.zip" -Algorithm SHA256).Hash
           
           # Download and hash arm64
-          $arm64Url = "$baseUrl/cortex-windows-arm64.zip"
+          $arm64Url = "$baseUrl/cortex-cli-windows-arm64.zip"
           try {
             Invoke-WebRequest -Uri $arm64Url -OutFile "cortex-arm64.zip" -ErrorAction Stop
             $arm64Hash = (Get-FileHash -Path "cortex-arm64.zip" -Algorithm SHA256).Hash
@@ -54,6 +55,7 @@ jobs:
             $arm64Url = ""
           }
           
+          echo "repo_url=$repoUrl" >> $env:GITHUB_OUTPUT
           echo "x64_url=$x64Url" >> $env:GITHUB_OUTPUT
           echo "x64_hash=$x64Hash" >> $env:GITHUB_OUTPUT
           echo "arm64_url=$arm64Url" >> $env:GITHUB_OUTPUT
@@ -125,11 +127,11 @@ jobs:
           PackageLocale: en-US
           Publisher: CortexLM
           PublisherUrl: https://github.com/CortexLM
-          PublisherSupportUrl: https://github.com/CortexLM/cortex-cli/issues
+          PublisherSupportUrl: ${{ steps.release.outputs.repo_url }}/issues
           PackageName: Cortex CLI
-          PackageUrl: https://github.com/CortexLM/cortex-cli
+          PackageUrl: ${{ steps.release.outputs.repo_url }}
           License: Apache-2.0
-          LicenseUrl: https://github.com/CortexLM/cortex-cli/blob/master/LICENSE
+          LicenseUrl: ${{ steps.release.outputs.repo_url }}/blob/main/LICENSE
           ShortDescription: Cortex CLI - A modern AI coding agent
           Description: Cortex is a powerful command-line AI coding assistant that helps developers write, debug, and maintain code more efficiently.
           Tags: