diff --git a/cmake/macros/OptionalWinExecutableSigning.cmake b/cmake/macros/OptionalWinExecutableSigning.cmake
index 4a33a513ba..6248985468 100644
--- a/cmake/macros/OptionalWinExecutableSigning.cmake
+++ b/cmake/macros/OptionalWinExecutableSigning.cmake
@@ -20,23 +20,14 @@ macro(optional_win_executable_signing)
           message(FATAL_ERROR "Code signing of executables was requested but signtool.exe could not be found.")
         endif ()
 
-        if (NOT EXECUTABLE_NAME)
-          set(EXECUTABLE_NAME $<TARGET_FILE_NAME:${TARGET_NAME}>)
+        if (NOT EXECUTABLE_PATH)
+          set(EXECUTABLE_PATH $<TARGET_FILE_NAME:${TARGET_NAME}>)
         endif ()
 
+        # setup a post build command to sign the executable
         add_custom_command(
           TARGET ${TARGET_NAME} POST_BUILD
-          COMMAND ${SIGNTOOL_EXEC} sign /f $ENV{HF_PFX_FILE} /p $ENV{HF_PFX_PASSPHRASE} /tr http://tsa.starfieldtech.com\ /td SHA256 $<TARGET_FILE_NAME:${TARGET_NAME}>
-        )
-
-        # setup the post install command to sign the executable
-        install(CODE "\
-          message(STATUS \"Signing ${TARGET_NAME} with signtool.\")
-          execute_process(COMMAND ${SIGNTOOL_EXEC} sign /f $ENV{HF_PFX_FILE}\
-            /p $ENV{HF_PFX_PASSPHRASE} /tr http://tsa.starfieldtech.com\
-            /td SHA256 \${CMAKE_INSTALL_PREFIX}/${EXECUTABLE_NAME})
-          "
-          COMPONENT ${EXECUTABLE_COMPONENT}
+          COMMAND ${SIGNTOOL_EXEC} sign /f %HF_PFX_FILE% /p %HF_PFX_PASSPHRASE% /tr http://tsa.starfieldtech.com\ /td SHA256 ${EXECUTABLE_PATH}
         )
       else ()
         message(FATAL_ERROR "HF_PFX_PASSPHRASE must be set for executables to be signed.")
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index 85055407be..055457cff8 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -30,14 +30,16 @@ if (APPLE)
     COMPONENT ${SERVER_COMPONENT}
   )
 elseif (WIN32)
+  set(CONSOLE_DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}")
+
   install(
-    DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}/"
+    DIRECTORY "${CONSOLE_DESTINATION}/"
     DESTINATION ${CONSOLE_INSTALL_DIR}
     COMPONENT ${SERVER_COMPONENT}
   )
 
   # sign the copied server console executable after install
-  set(EXECUTABLE_NAME ${CONSOLE_EXEC_NAME})
+  set(EXECUTABLE_PATH "${CONSOLE_DESTINATION}/${CONSOLE_EXEC_NAME}")
   optional_win_executable_signing()
 endif()