diff --git a/scripts/build-win64.bat b/scripts/build-win64.bat
index 7d04fbd64..fb1a11d64 100644
--- a/scripts/build-win64.bat
+++ b/scripts/build-win64.bat
@@ -12,7 +12,6 @@ set SCREENSHARE_INDICATOR_PATH="node_modules\screen-share-indicator-frame\Screen
 set NATIVE_WINDOW_HANDLE_PATH="node_modules\symphony-native-window-handle-helper\SymphonyNativeWindowHandleHelper.exe"
 set SCREEN_SNIPPET_PATH="node_modules\screen-snippet\ScreenSnippet.exe"
 set SYMPHONY_EXE_PATH=%WORKSPACE%\dist\win-unpacked\Symphony.exe
-set SYMPHONY_SYMVER_EXE_PATH=%WORKSPACE%\dist\Symphony-%SYMVER%-win.exe
 set SYMPHONY_MSI_PATH="WixSharpInstaller\Symphony.msi"
 
 set PATH=%PATH%;C:\Program Files\nodejs\;C:\Program Files\Git\cmd
@@ -55,7 +54,7 @@ echo %SS_FOLDER%
 call smctl sign  --fingerprint %DIGICERT_FINGERPRINT% --input %SCREENSHARE_INDICATOR_PATH% --tool signtool --verbose
 smctl sign verify --input node_modules\screen-share-indicator-frame\ScreenShareIndicatorFrame.exe
 
-smctl sign  --tool signtool --fingerprint %DIGICERT_FINGERPRINT% --input %NATIVE_WINDOW_HANDLE_PATH%
+smctl sign  --tool signtool --fingerprint %DIGICERT_FINGERPRINT% --input %NATIVE_WINDOW_HANDLE_PATH% --file-name
 smctl sign verify --input %NATIVE_WINDOW_HANDLE_PATH%
 
 IF %errorlevel% neq 0 (
@@ -63,7 +62,7 @@ IF %errorlevel% neq 0 (
 	exit /b -1
 )
 
-smctl sign  --tool signtool --fingerprint %DIGICERT_FINGERPRINT% --input %SCREEN_SNIPPET_PATH%
+smctl sign  --tool signtool --fingerprint %DIGICERT_FINGERPRINT% --input %SCREEN_SNIPPET_PATH% --file-name
 smctl sign verify --input %SCREEN_SNIPPET_PATH%
 
 IF %errorlevel% neq 0 (
@@ -117,15 +116,16 @@ set rootDir="%CD%"
 cd %installerDir%
 
 echo "Signing Symphony.exe file.."
-smctl sign  --tool signtool --fingerprint %DIGICERT_FINGERPRINT% --input %SYMPHONY_EXE_PATH%
+smctl sign  --tool signtool --fingerprint %DIGICERT_FINGERPRINT% --input %SYMPHONY_EXE_PATH% --file-name
 smctl sign verify --input %SYMPHONY_EXE_PATH%
 IF %errorlevel% neq 0 (
 	echo "Signing failed"
 	exit /b -1
 )
 
+set SYMPHONY_SYMVER_EXE_PATH=%WORKSPACE%\dist\Symphony-%SYMVER%-win.exe
 echo "Signing Symphony-SYMVER-win.exe file.."
-smctl sign  --tool signtool --fingerprint %DIGICERT_FINGERPRINT% --input %SYMPHONY_SYMVER_EXE_PATH%
+smctl sign  --tool signtool --fingerprint %DIGICERT_FINGERPRINT% --input %SYMPHONY_SYMVER_EXE_PATH% --file-name
 smctl sign verify --input %SYMPHONY_SYMVER_EXE_PATH%
 IF %errorlevel% neq 0 (
 	echo "Signing failed"
@@ -139,7 +139,7 @@ echo "Building new installer with Wix Sharp"
 call "BuildWixSharpInstaller.bat"
 
 echo "Signing MSI file.."
-smctl sign  --tool signtool --fingerprint %DIGICERT_FINGERPRINT% --input  %SYMPHONY_MSI_PATH%
+signtool sign /d Symphony /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 /sha1 %DIGICERT_FINGERPRINT% %SYMPHONY_MSI_PATH%
 smctl sign verify --input %SYMPHONY_MSI_PATH%
 IF %errorlevel% neq 0 (
 	echo "Failed to sign installer"