diff --git a/defaults/main.yml b/defaults/main.yml
index 4bbb930..7898407 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -42,6 +42,7 @@ system_base_softwares_arch:
   - 'unrar' 
   - 'git-lfs'
 
+<<<<<<< HEAD
 system_base_softwares_debian:
   - 'zsh'
   - 'stow'
@@ -73,3 +74,7 @@ system_base_softwares_debian:
   - 'git-lfs'
 
 
+=======
+
+system_upgrade: false
+>>>>>>> master
diff --git a/tasks/base_software.yml b/tasks/base_software.yml
index 5fa30fc..1003fbb 100644
--- a/tasks/base_software.yml
+++ b/tasks/base_software.yml
@@ -1,20 +1,3 @@
-#- name: upgrade system
-#  pacman:
-#    state: latest # not required. choices: absent;latest;present. Desired state of the package.
-#    upgrade: true # not required. Whether or not to upgrade whole system.
-#    force: true # not required. When removing package - force remove package, without any checks. When update_cache - force redownload repo databases.
-#    update_cache: true
-#  become: yes
-#  register: upgrade
-#
-#- debug: 
-#    var: upgrade
-#
-#- name: Reboot  updates to apply
-#  reboot:
-#    reboot_timeout: 3600
-#  when: upgrade.changed and "linux" in upgrade.packages
-#  become: yes
 
 - name: launch base install software
   pacman:
@@ -60,4 +43,19 @@
   become: true
   apt:
     deb: "{{debian_url}}"
-  when: ansible_facts['os_family'] == "Debian"
\ No newline at end of file
+  when: ansible_facts['os_family'] == "Debian"
+- name: upgrade system
+  pacman:
+      state: latest # not required. choices: absent;latest;present. Desired state of the package.
+      upgrade: true # not required. Whether or not to upgrade whole system.
+      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
+
+- name: Reboot  updates to apply
+  reboot:
+      reboot_timeout: 3600
+  when: upgrade.changed and "linux" in upgrade.packages and system_upgrade
+  become: yes