diff --git a/tasks/base_software.yml b/tasks/base_software.yml
index 2864018..c88cd67 100644
--- a/tasks/base_software.yml
+++ b/tasks/base_software.yml
@@ -5,8 +5,7 @@
       force: true # not required. When removing package - force remove package, without any checks. When update_cache - force redownload repo databases.
       update_cache: false
   become: yes
-  when: system_upgrade
-  register: upgrade
+  when: system_upgrade and  ansible_facts['os_family'] == "Archlinux"
 
 - name: upgrade system
   pacman:
@@ -15,13 +14,13 @@
       force: true # not required. When removing package - force remove package, without any checks. When update_cache - force redownload repo databases.
       update_cache: false
   become: yes
-  when: system_upgrade
+  when: system_upgrade and  ansible_facts['os_family'] == "Archlinux"
   register: upgrade
 
 - name: Reboot  updates to apply
   reboot:
       reboot_timeout: 3600
-  when: upgrade.changed and "linux" in upgrade.packages and system_upgrade
+  when: upgrade.changed and "linux" in upgrade.packages and system_upgrade and  ansible_facts['os_family'] == "Archlinux"
   become: yes
 
 - name: launch arch base install software
diff --git a/tasks/main.yml b/tasks/main.yml
index 34bbfaa..caab81b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,5 +7,4 @@
   when: ansible_facts['os_family'] == "Debian" 
 - include_tasks: AUR_builder.yml
   when: ansible_facts['os_family'] == "Archlinux" 
-
 - include_tasks: base_software.yml
\ No newline at end of file