diff --git a/hosts_init.yml b/hosts_init.yml
index a71f03a..eaf9ab5 100755
--- a/hosts_init.yml
+++ b/hosts_init.yml
@@ -46,15 +46,15 @@ datacenter:
         ansible_python_interpreter: /share/ZFS530_DATA/.qpkg/QPython312/bin/python3
     vms:
       children:
-        debian9:
+        debian13:
           hosts:
-            debian9-vm0[1:9].home.lan:
-            debian9-vm[10:27].home.lan:
+            debian13-vm0[1:9].home.lan:
+            debian13-vm[10:27].home.lan:
           vars:
             ansible_python_interpreter: /usr/bin/python3
             ansible_ssh_user: jd
             ansible_ssh_password: q
-            ansible_become_method: su
+            # ansible_become_method: su
             ansible_become_password: q
             ansible_ssh_pass: q
             ansible_become_user: root
diff --git a/hosts_roles.yml b/hosts_roles.yml
index 7be66d5..a49a8b4 100755
--- a/hosts_roles.yml
+++ b/hosts_roles.yml
@@ -129,7 +129,7 @@ datacenter:
               vars:
                 ansible_python_interpreter: /usr/bin/python3
                 ansible_ssh_user: root
-                ansible_ssh_private_key_file: ssh_key.pem
+                ansible_ssh_password: l4c1j4yd33Du5lo
             srv:
               hosts:
                 rpi5.home.lan:
@@ -183,10 +183,10 @@ datacenter:
             ansible_ssh_private_key_file: ssh_key.pem
     vms:
       children:
-        debian9:
+        debian13:
           hosts:
-            debian9-vm0[1:9].home.lan:
-            debian9-vm[10:27].home.lan:
+            debian13-vm0[1:9].home.lan:
+            debian13-vm[10:27].home.lan:
           vars:
             ansible_python_interpreter: /usr/bin/python3
             ansible_ssh_user: jd
diff --git a/roles/docker/tasks/Debian.yml b/roles/docker/tasks/Debian.yml
index 50a33cd..beb937c 100644
--- a/roles/docker/tasks/Debian.yml
+++ b/roles/docker/tasks/Debian.yml
@@ -10,6 +10,7 @@
           Acquire::http::Proxy "http://192.168.77.101:3142";
           Acquire::https::Proxy "false";
 
+
     - name: Print arch
       ansible.builtin.debug:
         msg: "{{ ansible_architecture }}"
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 9e509a2..53a630e 100755
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -1,7 +1,10 @@
 - name: Include vault
   ansible.builtin.include_vars:
     file: jaydee.yml
+    
 - name: Facts
   ansible.builtin.setup:
+  when: ansible_facts.architecture is not defined
+
 - name: Include OS-specific tasks
   ansible.builtin.include_tasks: "{{ ansible_facts.os_family }}.yml"
\ No newline at end of file
diff --git a/roles/docker_swarm/tasks/main.yml b/roles/docker_swarm/tasks/main.yml
index b6ca884..2fc75a3 100755
--- a/roles/docker_swarm/tasks/main.yml
+++ b/roles/docker_swarm/tasks/main.yml
@@ -5,25 +5,31 @@
   block:
     - name: Facts
       ansible.builtin.setup:
-    - name: Install Docker SDK for Python
-      pip:
-        name: docker>=5.0.0
-        executable: pip3
-        break_system_packages: true
+      when: ansible_facts.architecture is not defined
+
+    - name: Install docker SDK
+      ansible.builtin.apt:
+        name: python3-docker
+        state: present
+
+    - name: Set master host variable
+      set_fact:
+        master_host: "{{ (ansible_distribution | lower) ~ ansible_distribution_major_version ~ '-vm01.home.lan' }}"
+
     - name: Initialize swarm
       docker_swarm:
         state: present
         listen_addr: "{{ ansible_default_ipv4.address }}:2377"
       register: swarm_init
-      when: inventory_hostname == "vm01.home.lan"
+      when: inventory_hostname == master_host 
 
     - name: Show join tokens
       ansible.builtin.debug:
         msg:
           - "Manager join token: {{ swarm_init.swarm_facts['JoinTokens']['Manager'] }}"
           - "Worker join token: {{ swarm_init.swarm_facts['JoinTokens']['Worker'] }}"
-      when: inventory_hostname == "vm01.home.lan"
+      when: inventory_hostname == master_host
 
     - name: Join swarm as worker
-      shell: docker swarm join --token {{ hostvars['vm01.home.lan']['swarm_init'].swarm_facts['JoinTokens']['Worker'] }} {{ hostvars['vm01.home.lan']['ansible_default_ipv4']['address'] }}:2377
-      when: inventory_hostname != "vm01.home.lan"
\ No newline at end of file
+      shell: docker swarm join --token {{ hostvars[master_host]['swarm_init'].swarm_facts['JoinTokens']['Worker'] }} {{ hostvars[master_host]['ansible_default_ipv4']['address'] }}:2377
+      when: inventory_hostname != master_host 
\ No newline at end of file
diff --git a/roles/mqtt-srv/tasks/main.yml b/roles/mqtt-srv/tasks/main.yml
index 162a65e..6a304a6 100755
--- a/roles/mqtt-srv/tasks/main.yml
+++ b/roles/mqtt-srv/tasks/main.yml
@@ -8,6 +8,17 @@
       ansible.builtin.file:
         state: absent
         path: "{{ dest_folder }}"
+    
+    - name: Check if git binary exists
+      stat:
+        path: /usr/bin/git
+      register: git_stat
+    
+    - name: Include git
+      ansible.builtin.include_role:
+        name: git
+      when: not git_stat.stat.exists
+
     - name: GIT pull
       tags:
         - git_pull
diff --git a/roles/zabbix-agent/tasks/main.yml b/roles/zabbix-agent/tasks/main.yml
index 9166852..3498911 100755
--- a/roles/zabbix-agent/tasks/main.yml
+++ b/roles/zabbix-agent/tasks/main.yml
@@ -89,8 +89,16 @@
           - zabbix-agent2-plugin-postgresql
           # - zabbix-agent2-plugin-mysql
         update_cache: true
+      when: inventory_hostname not in ['nas.home.lan','router.home.lan']
+    - name: Install zabbix packages
+      ansible.builtin.apt:
+        name:
+          - zabbix-agent2
+          # - zabbix-agent2-plugin-mysql
+        update_cache: true
+      when: inventory_hostname == 'router.home.lan'
+
 
-      when: inventory_hostname != 'nas.home.lan'
     - name: Upgrade zabbix packages
       ansible.builtin.apt:
         name:
@@ -100,7 +108,7 @@
           # - zabbix-agent2-plugin-mysql
         only_upgrade: true
         state: present
-      when: inventory_hostname != 'nas.home.lan'
+      when: inventory_hostname not in ['nas.home.lan','router.home.lan']
 
     - name: Reconfigure zabbix agent Server
       ansible.builtin.lineinfile: