diff --git a/hosts_roles.yml b/hosts_roles.yml
index 7bd9aa6..c545890 100755
--- a/hosts_roles.yml
+++ b/hosts_roles.yml
@@ -163,3 +163,11 @@ datacenter:
             # ansible_user: admin
             # ansible_pass: l4c1!j4yd33?Du5lo1
             ansible_python_interpreter: /share/ZFS530_DATA/.qpkg/QPython312/bin/python3
+        desktops:
+          hosts:
+            morefine.home.lan:
+          vars:
+            ansible_python_interpreter: /usr/bin/python3
+            ansible_ssh_user: jd
+            ansible_become_password: q
+            ansible_ssh_private_key_file: ssh_key.pem
diff --git a/roles/autofs_client/tasks/main.yml b/roles/autofs_client/tasks/main.yml
index 7b56f1f..678ef78 100755
--- a/roles/autofs_client/tasks/main.yml
+++ b/roles/autofs_client/tasks/main.yml
@@ -29,47 +29,75 @@
         mode: '0600'
         owner: root
         group: root
+    # - name: Creating a file with content
+    #   ansible.builtin.copy:
+    #     dest: "/etc/auto.nas-movies"
+    #     content: |
+    #       movies  -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/movies
+    #     mode: '0600'
+    #     owner: root
+    #     group: root
+
     - name: Creating a file with content
       ansible.builtin.copy:
         dest: "/etc/auto.nas-movies"
         content: |
-          movies  -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/movies
+          movies --fstype=nfs,rw nas.home.lan:/movies
         mode: '0600'
         owner: root
         group: root
 
-    - name: Creating a file with content
-      ansible.builtin.copy:
-        dest: "/etc/auto.nas-music"
-        content: |
-          music   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/music
-        mode: '0600'
-        owner: root
-        group: root
+    # - name: Creating a file with content
+    #   ansible.builtin.copy:
+    #     dest: "/etc/auto.nas-music"
+    #     content: |
+    #       music   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/music
+    #     mode: '0600'
+    #     owner: root
+    #     group: root
 
-    - name: Creating a file with content
-      ansible.builtin.copy:
-        dest: "/etc/auto.nas-shows"
-        content: |
-          shows   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/shows
-        mode: '0600'
-        owner: root
-        group: root
+    # - name: Creating a file with content
+    #   ansible.builtin.copy:
+    #     dest: "/etc/auto.nas-music"
+    #     content: |
+    #       music   --fstype=nfs,rw ://nas.home.lan/music
+    #     mode: '0600'
+    #     owner: root
+    #     group: root
+
+    # - name: Creating a file with content
+    #   ansible.builtin.copy:
+    #     dest: "/etc/auto.nas-shows"
+    #     content: |
+    #       shows   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/shows
+    #     mode: '0600'
+    #     owner: root
+    #     group: root
+
+    # - name: Creating a file with content
+    #   ansible.builtin.copy:
+    #     dest: "/etc/auto.nas"
+    #     content: |
+    #       nas-data   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/Data
+    #       nas-docker-data   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/docker_data
+    #       nas-photo -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/Photo
+    #       nas-public   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/Public
+    #       nas-install   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/install
+    #       nas-downloads   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/downloads
+    #       nas-games   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw  ://nas.home.lan/qda_2
+    #     mode: '0600'
+    #     owner: root
+    #     group: root
 
     - name: Creating a file with content
       ansible.builtin.copy:
         dest: "/etc/auto.nas"
         content: |
-          nas-data   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/Data
-          nas-docker-data   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/docker_data
-          nas-photo -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/Photo
-          nas-public   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/Public
-          nas-install   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/install
-          nas-downloads   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw    ://nas.home.lan/downloads
-          nas-games   -fstype=cifs,credentials=/etc/auto.auth,dir_mode=0755,file_mode=0755,uid=jd,rw  ://nas.home.lan/qda_2
+          nas-data   --fstype=nfs,rw nas.home.lan:/Data
+          qda_1   --fstype=nfs,rw nas.home.lan:/qda_1
         mode: '0600'
         owner: root
-        group: root
+        group: root    
     # - name: Reconfigure autofs Server
     #   ansible.builtin.lineinfile:
     #     path: /etc/auto.master
@@ -77,21 +105,21 @@
     #     insertafter: '^/media/nas'
     #     line: "/media/nas   /etc/auto.nas --timeout 360 --ghost"
 
-    - name: Reconfigure autofs Server
-      ansible.builtin.lineinfile:
-        path: /etc/auto.master
-        regexp: "^/media/data/music/nas.*"
-        line: /media/data/music/nas   /etc/auto.nas-music --timeout 360 --ghost
+    # - name: Reconfigure autofs Server
+    #   ansible.builtin.lineinfile:
+    #     path: /etc/auto.master
+    #     regexp: "^/media/data/music/nas.*"
+    #     line: /media/data/music/nas   /etc/auto.nas-music --timeout 360 --ghost
     - name: Reconfigure autofs Server
       ansible.builtin.lineinfile:
         path: /etc/auto.master
         regexp: "^/media/data/movies/nas.*"
         line: /media/data/movies/nas   /etc/auto.nas-movies --timeout 360 --ghost
-    - name: Reconfigure autofs Server
-      ansible.builtin.lineinfile:
-        path: /etc/auto.master
-        regexp: "^/media/data/shows/nas.*"
-        line: /media/data/shows/nas   /etc/auto.nas-shows --timeout 360 --ghost
+    # - name: Reconfigure autofs Server
+    #   ansible.builtin.lineinfile:
+    #     path: /etc/auto.master
+    #     regexp: "^/media/data/shows/nas.*"
+    #     line: /media/data/shows/nas   /etc/auto.nas-shows --timeout 360 --ghost
 
 
     - name: Reconfigure autofs Server
diff --git a/roles/mqtt-srv/tasks/main.yml b/roles/mqtt-srv/tasks/main.yml
index b01c6c3..162a65e 100755
--- a/roles/mqtt-srv/tasks/main.yml
+++ b/roles/mqtt-srv/tasks/main.yml
@@ -54,6 +54,14 @@
         group: root
         remote_src: true
       when: inventory_hostname != 'nas.home.lan'
+    - name: Upload monitors script
+      ansible.builtin.copy:
+        src: "get_monitors.sh"
+        dest: /myapps/mqtt_srv/get_monitors.sh
+        mode: '0755'
+        owner: root
+        group: root
+      when: inventory_hostname == 'morefine.home.lan'      
     - name: Upload service req
       ansible.builtin.copy:
         src: "{{ dest_folder }}/requirements.txt"
diff --git a/roles/omv_backup/tasks/main.yml b/roles/omv_backup/tasks/main.yml
index ab16f74..83883d5 100755
--- a/roles/omv_backup/tasks/main.yml
+++ b/roles/omv_backup/tasks/main.yml
@@ -59,7 +59,15 @@
         owner: root
         group: root
       when: inventory_hostname != 'nas.home.lan'
-
+    - name: Upload docker_backups.py
+      ansible.builtin.copy:
+        src: "{{ dest_folder }}/docker_backups.py"
+        dest: /myapps/docker_backups.py
+        remote_src: true
+        mode: '0755'
+        owner: root
+        group: root
+      when: inventory_hostname == 'm-server.home.lan'
     - name: Install venv
       ansible.builtin.apt:
         name:
diff --git a/roles/wake_on_lan/tasks/main.yml b/roles/wake_on_lan/tasks/main.yml
index dc96b11..e6c9422 100755
--- a/roles/wake_on_lan/tasks/main.yml
+++ b/roles/wake_on_lan/tasks/main.yml
@@ -10,23 +10,20 @@
   ansible.builtin.set_fact: 
     active_adapter: '{{ item }}'
   loop: '{{ ansible_facts.interfaces }}'
-  when: 'item.startswith("eno")'
-- name: Display all interfaces name
-  ansible.builtin.debug:
-    msg: "{{ ansible_default_ipv4.interface }}"
+  when: '(item.startswith("eno") or item.startswith("enp")) and not item.endswith("avahi")'
 
 
 - name: Creating config
   become: true
   ansible.builtin.copy:
-    dest: "/etc/systemd/system/wol.service"
+    dest: "/etc/systemd/system/wol@.service"
     content: |
       [Unit]
       Description=Enable Wake On Lan
 
       [Service]
       Type=oneshot
-      ExecStart = /usr/sbin/ethtool --change {{ ansible_default_ipv4.interface }} wol g
+      ExecStart = /usr/sbin/ethtool --change %i wol g
 
       [Install]
       WantedBy=basic.target
@@ -34,7 +31,9 @@
     mode: '0744'
 - name: Restart service wol, in all cases
   ansible.builtin.service:
-    name: wol
+    name: wol@{{ item }}
     state: restarted
     enabled: true
   become: true
+  loop: '{{ ansible_facts.interfaces }}'
+  when: '(item.startswith("eno") or item.startswith("enp")) and not item.endswith("avahi")'