diff --git a/olimp-deploy.yml b/olimp-deploy.yml
index a7a7b44..1e01ceb 100644
--- a/olimp-deploy.yml
+++ b/olimp-deploy.yml
@@ -1,71 +1,106 @@
 ---
+# =============================================================================
+# OLIMP DEPLOY — Основной playbook развёртывания
+# =============================================================================
+
+# Все серверы (кроме Proxmox)
 - hosts: all:!pve-server
+  vars_files:
+    - vault.yml
   roles:
-    - {role: base_setup,              tags: deploy_base}
-    - {role: system_cleanup,          tags: deploy_cleanup}
-#    - {role: cadvisor,                tags: deploy_cadvisor}
-    - {role: promtail,                tags: deploy_promtail}
+    - { role: base_setup,        tags: deploy_base }
+    - { role: system_cleanup,    tags: deploy_cleanup }
+    - { role: promtail,          tags: deploy_promtail }
 
+# Proxmox VE
 - hosts: pve-server
+  vars_files:
+    - vault.yml
   roles:
-    - { role: proxmox_base_setup,     tags: deploy_proxmox_base }
-    - { role: proxmox_monitoring,     tags: deploy_proxmox_monitoring }
+    - { role: proxmox_base_setup,    tags: deploy_proxmox_base }
+    - { role: proxmox_monitoring,    tags: deploy_proxmox_monitoring }
 
+# Gateway (NPM, Heimdall, Dashy)
 - hosts: gateway-server
+  vars_files:
+    - vault.yml
   roles:
-    - { role: docker,                 tags: deploy_docker }
-    - { role: npm,                    tags: deploy_npm }
-    - { role: heimdall,               tags: deploy_heimdall }
+    - { role: docker,    tags: deploy_docker }
+    - { role: npm,       tags: deploy_npm }
+    - { role: heimdall,  tags: deploy_heimdall }
+    - { role: dashy,     tags: deploy_dashy }
 
+# Data (Bitwarden, Mealie, Bookstack)
 - hosts: data-server
+  vars_files:
+    - vault.yml
   roles:
-    - { role: docker,                 tags: deploy_docker }
-    - { role: mealie,                 tags: deploy_mealie }
-    - { role: bookstack,              tags: deploy_bookstack }
-    - { role: bitwarden,              tags: deploy_bitwarden }
+    - { role: docker,     tags: deploy_docker }
+    - { role: mealie,     tags: deploy_mealie }
+    - { role: bookstack,  tags: deploy_bookstack }
+    - { role: bitwarden,  tags: deploy_bitwarden }
 
+# Media (Jellyfin, Ampache, Calibre, Flibusta)
 - hosts: media-server
+  vars_files:
+    - vault.yml
   roles:
-    - { role: docker,                 tags: deploy_docker }
-    - { role: ampache,                tags: deploy_ampache }  
-    - { role: audiobookshelf,         tags: deploy_audiobookshelf }
-    - { role: calibre-web,            tags: deploy_calibre_web }
-    - { role: jellyfin,               tags: deploy_jellyfin }
-    - { role: flibusta,               tags: deploy_flibusta }
+    - { role: docker,           tags: deploy_docker }
+    - { role: ampache,          tags: deploy_ampache }
+    - { role: audiobookshelf,   tags: deploy_audiobookshelf }
+    - { role: calibre-web,      tags: deploy_calibre_web }
+    - { role: jellyfin,         tags: deploy_jellyfin }
+    - { role: flibusta,         tags: deploy_flibusta }
 
+# Photo (Immich)
 - hosts: photo-server
+  vars_files:
+    - vault.yml
   roles:
-    - { role: docker,                 tags: deploy_docker }
-    - { role: immich,                 tags: deploy_immich }
+    - { role: docker,   tags: deploy_docker }
+    - { role: immich,   tags: deploy_immich }
 
+# Talk (Mumble, Snikket, Matrix, TeamSpeak)
 - hosts: talk-server
   vars_files:
     - vault.yml
   roles:
-    - { role: docker,                 tags: deploy_docker }
-    - { role: mumble,                 tags: deploy_mumble }
-    - { role: teamspeak,              tags: deploy_teamspeak }
-    - { role: cadvisor,               tags: deploy_cadvisor}
+    - { role: docker,    tags: deploy_docker }
+    - { role: mumble,    tags: deploy_mumble }
+    - { role: snikket,   tags: deploy_snikket }
+    # - { role: teamspeak, tags: deploy_teamspeak }
 
+# Games (Minecraft)
 - hosts: games-server
+  vars_files:
+    - vault.yml
   roles:
-    - { role: docker,                 tags: deploy_docker }
-#    - { role: minecraft,              tags: deploy_minecraft }
-    
+    - { role: docker,      tags: deploy_docker }
+    # - { role: minecraft, tags: deploy_minecraft }
+
+# Manage (Grafana, Loki, MeshCentral)
 - hosts: manage-server
+  vars_files:
+    - vault.yml
   roles:
-    - { role: docker,                 tags: deploy_docker }
-    - { role: meshcentral,            tags: deploy_meshcentral }
-    - { role: grafana,                tags: deploy_grafana }
-    - { role: loki,                   tags: deploy_loki }
+    - { role: docker,        tags: deploy_docker }
+    - { role: meshcentral,   tags: deploy_meshcentral }
+    - { role: grafana,       tags: deploy_grafana }
+    - { role: loki,          tags: deploy_loki }
 
+# Git (GitLab)
 - hosts: git-server
+  vars_files:
+    - vault.yml
   roles:
-    - { role: docker,                  tags: deploy_docker }
-    - { role: gitlab,                  tags: deploy_gitlab }
+    - { role: docker,   tags: deploy_docker }
+    - { role: gitlab,   tags: deploy_gitlab }
 
+# Torrent (Qbittorrent, TorrServer)
 - hosts: torrent-server
+  vars_files:
+    - vault.yml
   roles:
-    - { role: docker,                 tags: deploy_docker }
-    - { role: torrserver,             tags: deploy_torrserver }
-    - { role: qbittorrent,            tags: deploy_qbittorrent }
\ No newline at end of file
+    - { role: docker,       tags: deploy_docker }
+    - { role: torrserver,   tags: deploy_torrserver }
+    - { role: qbittorrent,  tags: deploy_qbittorrent }
\ No newline at end of file