diff --git a/azure-pipelines-windows-template-qt6.yml b/azure-pipelines-windows-template-qt6.yml
index 5ab1f0f2..af5b0b20 100644
--- a/azure-pipelines-windows-template-qt6.yml
+++ b/azure-pipelines-windows-template-qt6.yml
@@ -50,8 +50,9 @@ jobs:
   - script: |
       set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH%
       cd $(Build.SourcesDirectory)\ci\win
-      .\create_installer.cmd ${{ parameters.architecture }} 7z $(Build.BuildNumber) qt6
-      "C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\SignTool.exe" sign /f $(Agent.TempDirectory)\certificate.pfx /p $(pfxPassword) ..\Output\*.exe
+      .\create_installer.cmd ${{ parameters.architecture }} 7z $(Build.BuildNumber) qt6 $(Agent.TempDirectory)\certificate.pfx %PASSWORD%
+    env:
+      PASSWORD: $(pfxPassword)
     displayName: 'Create installer'
   - task: CopyFiles@2
     inputs:
diff --git a/azure-pipelines-windows-template.yml b/azure-pipelines-windows-template.yml
index 1f3757d2..4bdb232b 100644
--- a/azure-pipelines-windows-template.yml
+++ b/azure-pipelines-windows-template.yml
@@ -50,8 +50,9 @@ jobs:
   - script: |
       set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH%
       cd $(Build.SourcesDirectory)\ci\win
-      .\create_installer.cmd ${{ parameters.architecture }} 7z $(Build.BuildNumber) qt5
-      "C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\SignTool.exe" sign /f $(Agent.TempDirectory)\certificate.pfx /p $(pfxPassword) ..\Output\*.exe
+      .\create_installer.cmd ${{ parameters.architecture }} 7z $(Build.BuildNumber) qt5 $(Agent.TempDirectory)\certificate.pfx %PASSWORD%
+    env:
+      PASSWORD: $(pfxPassword)
     displayName: 'Create installer'
   - task: CopyFiles@2
     inputs:
diff --git a/ci/win/build_installer.iss b/ci/win/build_installer.iss
index 420ab1d0..7a2e9a83 100644
--- a/ci/win/build_installer.iss
+++ b/ci/win/build_installer.iss
@@ -15,6 +15,7 @@ SetupIconFile=setup.ico
 UninstallDisplayIcon=uninstall.ico
 ArchitecturesInstallIn64BitMode=x64
 ArchitecturesAllowed=x64
+SignTool=signtool
 
 [Registry]
 Root: HKCR; SubKey: .cbz; ValueType: string; ValueData: Comic Book (zip); Flags: uninsdeletekey; Tasks: File_association
diff --git a/ci/win/build_installer_qt6.iss b/ci/win/build_installer_qt6.iss
index 4616286a..ec5fe9e9 100644
--- a/ci/win/build_installer_qt6.iss
+++ b/ci/win/build_installer_qt6.iss
@@ -15,6 +15,7 @@ SetupIconFile=setup.ico
 UninstallDisplayIcon=uninstall.ico
 ArchitecturesInstallIn64BitMode=x64
 ArchitecturesAllowed=x64
+SignTool=signtool
 
 [Registry]
 Root: HKCR; SubKey: .cbz; ValueType: string; ValueData: Comic Book (zip); Flags: uninsdeletekey; Tasks: File_association
diff --git a/ci/win/create_installer.cmd b/ci/win/create_installer.cmd
index 83af562f..82fa97f3 100644
--- a/ci/win/create_installer.cmd
+++ b/ci/win/create_installer.cmd
@@ -60,9 +60,9 @@ if "%1"=="x86" (
 
 echo "iscc start"
 if "%4"=="qt6" (
-	iscc /DVERSION=%VERSION% /DPLATFORM=%1 /DCOMPRESSED_ARCHIVE_BACKEND=%2 /DBUILD_NUMBER=%3 build_installer_qt6.iss || exit /b
+	iscc /DVERSION=%VERSION% /DPLATFORM=%1 /DCOMPRESSED_ARCHIVE_BACKEND=%2 /DBUILD_NUMBER=%3 build_installer_qt6.iss "/Ssigntool=$qC:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\SignTool.exe$q sign /f %5 /p %6 $f" || exit /b
 ) else (
-	iscc /DVERSION=%VERSION% /DPLATFORM=%1 /DCOMPRESSED_ARCHIVE_BACKEND=%2 /DBUILD_NUMBER=%3 build_installer.iss || exit /b
+	iscc /DVERSION=%VERSION% /DPLATFORM=%1 /DCOMPRESSED_ARCHIVE_BACKEND=%2 /DBUILD_NUMBER=%3 build_installer.iss "/Ssigntool=$qC:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\SignTool.exe$q sign /f %5 /p %6 $f" || exit /b
 )
 echo "iscc done!"