diff --git a/distribution/windows/setup/build.bat b/distribution/windows/setup/build.bat
index dfeba4491..fe50347f5 100644
--- a/distribution/windows/setup/build.bat
+++ b/distribution/windows/setup/build.bat
@@ -4,4 +4,4 @@ echo ##teamcity[progressStart 'Building setup file']
 inno\ISCC.exe sonarr.iss
 echo ##teamcity[progressFinish 'Building setup file']
 
-echo ##teamcity[publishArtifacts 'distribution\windows\setup\output\*.exe']
+echo ##teamcity[publishArtifacts 'distribution\windows\setup\output\*%RUNTIME%*.exe']
diff --git a/distribution/windows/setup/sonarr.iss b/distribution/windows/setup/sonarr.iss
index 270e246ba..e879a4cf5 100644
--- a/distribution/windows/setup/sonarr.iss
+++ b/distribution/windows/setup/sonarr.iss
@@ -28,7 +28,7 @@ DefaultDirName={commonappdata}\Sonarr\bin
 DisableDirPage=yes
 DefaultGroupName={#AppName}
 DisableProgramGroupPage=yes
-OutputBaseFilename=Sonarr.{#BranchName}.{#BuildNumber}.windows.{#Framework}
+OutputBaseFilename=Sonarr.{#BranchName}.{#BuildNumber}.{#Runtime}-installer
 SolidCompression=yes
 AppCopyright=Creative Commons 3.0 License
 AllowUNCPath=False