diff --git a/workflow-templates/build-app.tpl.yaml b/workflow-templates/build-app.tpl.yaml
index e4b9025ac..beae0c799 100644
--- a/workflow-templates/build-app.tpl.yaml
+++ b/workflow-templates/build-app.tpl.yaml
@@ -203,7 +203,7 @@ jobs:
           trusted-signing-account-name: DbGate
           certificate-profile-name: DbGate-Release
 
-          files-folder: app/dist
+          files-folder: <<artifact-root>>
           files-folder-filter: exe
 
           timestamp-rfc3161: http://timestamp.acs.microsoft.com
@@ -212,6 +212,7 @@ jobs:
       - name: Fix YML hashes
         if: matrix.os == 'windows-2022'
         run: |
+          <<cd_merged>>
           yarn run fixYmlHashes
 
       - name: Copy artifacts