diff --git a/playbooks/install_mqtt_srv.yml b/playbooks/install_mqtt_srv.yml
index 5c056b1..c519a56 100644
--- a/playbooks/install_mqtt_srv.yml
+++ b/playbooks/install_mqtt_srv.yml
@@ -12,13 +12,15 @@
     #   when: inventory_hostname not in groups['nas'] and inventory_hostname not in groups['router']
     #   become: "{{ 'no' if inventory_hostname in groups['nas'] else 'yes' }}"
 
+    - debug:
+        msg: "{{ inventory_hostname }}"
 
     - name: Upload service config
       ansible.builtin.copy:
         src: services/mqtt_srv.service
         dest: /etc/systemd/system/
-      when: inventory_hostname not in groups['nas.home.lan']
-      become: "{{ 'no' if inventory_hostname in groups['nas.home.lan'] else 'yes' }}"
+      when: inventory_hostname != 'nas.home.lan'
+      become: "{{ 'no' if inventory_hostname == 'nas.home.lan' else 'yes' }}"
 
 
 
@@ -28,16 +30,17 @@
         dest: /usr/bin/
         mode: '755'
         owner: root
-      when: inventory_hostname not in groups['nas.home.lan']
-      become: "{{ 'no' if inventory_hostname in groups['nas.home.lan'] else 'yes' }}"
+      when: inventory_hostname != 'nas.home.lan'
+      become: "{{ 'no' if inventory_hostname == 'nas.home.lan' else 'yes' }}"
+      
     - name: Upload service script config
       ansible.builtin.copy:
         src: scripts/mqtt_srv.cfg
         dest: /etc/mqtt_srv/
         mode: '755'
         owner: root
-      when: inventory_hostname not in groups['nas.home.lan']
-      become: "{{ 'no' if inventory_hostname in groups['nas.home.lan'] else 'yes' }}"
+      when: inventory_hostname != 'nas.home.lan'
+      become: "{{ 'no' if inventory_hostname == 'nas.home.lan' else 'yes' }}"
     # - name: Upload service script1
     #   ansible.builtin.copy:
     #     src: scripts/mqtt_srv.sh
@@ -63,8 +66,8 @@
         dest: /etc/init.d/
         mode: '755'
         owner: admin
-      when: inventory_hostname in groups['nas.home.lan']
-      become: "{{ 'no' if inventory_hostname in groups['nas.home.lan'] else 'yes' }}"
+      when: inventory_hostname != 'nas.home.lan'
+      become: "{{ 'no' if inventory_hostname == 'nas.home.lan' else 'yes' }}"
 
     - name: Upload service script2
       ansible.builtin.copy:
@@ -72,8 +75,8 @@
         dest: /usr/bin/
         mode: '755'
         owner: admin
-      when: inventory_hostname in groups['nas.home.lan']
-      become: "{{ 'no' if inventory_hostname in groups['nas.home.lan'] else 'yes' }}"
+      when: inventory_hostname != 'nas.home.lan'
+      become: "{{ 'no' if inventory_hostname == 'nas.home.lan' else 'yes' }}"
 
     - name: Install bottle python package
       ansible.builtin.shell: pip  install {{ item }}  --break-system-packages
@@ -83,15 +86,15 @@
         - ping3
         - psutil
         - autorandr
-      when: inventory_hostname not in groups['nas.home.lan']
-      become: "{{ 'no' if inventory_hostname in groups['nas.home.lan'] else 'yes' }}"
+      when: inventory_hostname != 'nas.home.lan'
+      become: "{{ 'no' if inventory_hostname == 'nas.home.lan' else 'yes' }}"
 
 
     - name: Just force systemd to reread configs (2.4 and above)
       ansible.builtin.systemd:
         daemon_reload: true
-      when: inventory_hostname not in groups['nas']
-      become: "{{ 'no' if inventory_hostname in groups['nas.home.lan'] else 'yes' }}"
+      when: inventory_hostname != 'nas.home.lan'
+      become: "{{ 'no' if inventory_hostname == 'nas.home.lan' else 'yes' }}"
 
 
     - name: Restart mqtt_srv service
@@ -99,13 +102,13 @@
         name: mqtt_srv.service
         state: restarted
         enabled: true
-      when: inventory_hostname not in groups['nas.home.lan']
-      become: "{{ 'no' if inventory_hostname in groups['nas.home.lan'] else 'yes' }}"
+      when: inventory_hostname != 'nas.home.lan'
+      become: "{{ 'no' if inventory_hostname == 'nas.home.lan' else 'yes' }}"
 
     - name: Restart mqtt service
       ansible.builtin.shell: "(/etc/init.d/mqtt_srv.sh restart >/dev/null 2>&1 &)"
       async: 10
       poll: 0
-      when: inventory_hostname in groups['nas']
-      become: "{{ 'no' if inventory_hostname in groups['nas.home.lan'] else 'yes' }}"
+      when: inventory_hostname != 'nas.home.lan'
+      become: "{{ 'no' if inventory_hostname == 'nas.home.lan' else 'yes' }}"