diff --git a/ansible/deploy_aw_server.yml b/ansible/deploy_aw_server.yml
index 7ae9fd1..aebe8ea 100644
--- a/ansible/deploy_aw_server.yml
+++ b/ansible/deploy_aw_server.yml
@@ -272,10 +272,33 @@
             dest: /opt/activitywatch/aw-server/apply_webui_ru_patch.sh
             mode: "0755"
 
+        - name: Записать /etc/activitywatch/aw-server.env перед хотфиксами
+          ansible.builtin.copy:
+            dest: /etc/activitywatch/aw-server.env
+            mode: "0640"
+            owner: root
+            group: root
+            content: |
+              AW_SERVER_BIND_HOST={{ aw_server_bind_host }}
+              AW_SERVER_PORT={{ aw_server_port }}
+              AW_SERVER_DATA_DIR={{ aw_server_data_dir }}
+              AW_SERVER_DB_PATH={{ aw_server_db_path }}
+              AW_SERVER_LOG_DIR={{ aw_server_log_dir }}
+              AW_SERVER_WEBUI_DIR={{ aw_server_webui_dir }}
+              AW_SERVER_USER={{ aw_server_user }}
+              AW_SERVER_GROUP={{ aw_server_group }}
+              XDG_DATA_HOME={{ aw_server_data_dir }}/.local/share
+              XDG_CONFIG_HOME={{ aw_server_data_dir }}/.config
+
         - name: Применить хотфиксы compiled JS чанков (Trends, Timespiral, Category helper)
           ansible.builtin.command:
             cmd: "/opt/activitywatch/aw-server/apply_webui_ru_patch.sh"
-          ignore_errors: true
+          register: apply_ru_patch_result
+          failed_when: false
+
+        - name: Вывести результат применения хотфиксов
+          ansible.builtin.debug:
+            msg: "apply_webui_ru_patch.sh: {{ apply_ru_patch_result.stdout }}"
 
         - name: Проверить наличие index.html после копирования
           ansible.builtin.stat:
@@ -306,24 +329,6 @@
             regexp: '</body>'
             replace: '<script defer="defer" src="/js/ru-patch-v5.js?v={{ aw_ru_patch_cache_bust }}"></script></body>'
 
-        - name: Записать /etc/activitywatch/aw-server.env
-          ansible.builtin.copy:
-            dest: /etc/activitywatch/aw-server.env
-            mode: "0640"
-            owner: root
-            group: root
-            content: |
-              AW_SERVER_BIND_HOST={{ aw_server_bind_host }}
-              AW_SERVER_PORT={{ aw_server_port }}
-              AW_SERVER_DATA_DIR={{ aw_server_data_dir }}
-              AW_SERVER_DB_PATH={{ aw_server_db_path }}
-              AW_SERVER_LOG_DIR={{ aw_server_log_dir }}
-              AW_SERVER_WEBUI_DIR={{ aw_server_webui_dir }}
-              AW_SERVER_USER={{ aw_server_user }}
-              AW_SERVER_GROUP={{ aw_server_group }}
-              XDG_DATA_HOME={{ aw_server_data_dir }}/.local/share
-              XDG_CONFIG_HOME={{ aw_server_data_dir }}/.config
-
         - name: Скопировать merge script AW DB на сервер
           ansible.builtin.copy:
             src: "{{ aw_repo_root }}/scripts/merge_aw_server_dbs.py"
diff --git a/install-kit-awindows-20260427-211240/ansible/deploy_aw_server.yml b/install-kit-awindows-20260427-211240/ansible/deploy_aw_server.yml
index b35b8e3..b69bd34 100644
--- a/install-kit-awindows-20260427-211240/ansible/deploy_aw_server.yml
+++ b/install-kit-awindows-20260427-211240/ansible/deploy_aw_server.yml
@@ -212,10 +212,33 @@
         dest: /opt/activitywatch/aw-server/apply_webui_ru_patch.sh
         mode: "0755"
 
+    - name: Записать /etc/activitywatch/aw-server.env перед хотфиксами
+      ansible.builtin.copy:
+        dest: /etc/activitywatch/aw-server.env
+        mode: "0640"
+        owner: root
+        group: root
+        content: |
+          AW_SERVER_BIND_HOST={{ aw_server_bind_host }}
+          AW_SERVER_PORT={{ aw_server_port }}
+          AW_SERVER_DATA_DIR={{ aw_server_data_dir }}
+          AW_SERVER_DB_PATH={{ aw_server_db_path }}
+          AW_SERVER_LOG_DIR={{ aw_server_log_dir }}
+          AW_SERVER_WEBUI_DIR={{ aw_server_webui_dir }}
+          AW_SERVER_USER={{ aw_server_user }}
+          AW_SERVER_GROUP={{ aw_server_group }}
+          XDG_DATA_HOME={{ aw_server_data_dir }}/.local/share
+          XDG_CONFIG_HOME={{ aw_server_data_dir }}/.config
+
     - name: Применить хотфиксы compiled JS чанков (Trends, Timespiral, Category helper)
       ansible.builtin.command:
         cmd: "/opt/activitywatch/aw-server/apply_webui_ru_patch.sh"
-      ignore_errors: true
+      register: apply_ru_patch_result
+      failed_when: false
+
+    - name: Вывести результат применения хотфиксов
+      ansible.builtin.debug:
+        msg: "apply_webui_ru_patch.sh: {{ apply_ru_patch_result.stdout }}"
 
     - name: Проверить наличие index.html после копирования
       ansible.builtin.stat:
@@ -246,21 +269,6 @@
         regexp: '</body>'
         replace: '<script defer="defer" src="/js/ru-patch-v5.js?v={{ aw_ru_patch_cache_bust }}"></script></body>'
 
-    - name: Записать /etc/activitywatch/aw-server.env
-      ansible.builtin.copy:
-        dest: /etc/activitywatch/aw-server.env
-        mode: "0640"
-        owner: root
-        group: root
-        content: |
-          AW_SERVER_BIND_HOST={{ aw_server_bind_host }}
-          AW_SERVER_PORT={{ aw_server_port }}
-          AW_SERVER_DATA_DIR={{ aw_server_data_dir }}
-          AW_SERVER_LOG_DIR={{ aw_server_log_dir }}
-          AW_SERVER_WEBUI_DIR={{ aw_server_webui_dir }}
-          AW_SERVER_USER={{ aw_server_user }}
-          AW_SERVER_GROUP={{ aw_server_group }}
-
     - name: Включить и запустить сервис
       ansible.builtin.systemd:
         name: activitywatch-server.service