diff --git a/ansible/roles/ovos_installer/tasks/ovos.yml b/ansible/roles/ovos_installer/tasks/ovos.yml
index a8c1f4c0..5b292d17 100644
--- a/ansible/roles/ovos_installer/tasks/ovos.yml
+++ b/ansible/roles/ovos_installer/tasks/ovos.yml
@@ -10,20 +10,22 @@
       - "{{ ovos_installer_user_home }}/.config/OpenVoiceOS/*"
       - "{{ ovos_installer_user_home }}/.config/wireplumber/*"
       - "{{ ovos_installer_user_home }}/.local/share/hivemind/*"
+  when: ovos_installer_cleaning | bool
   tags:
     - uninstall
 
-# - name: Backup existing configurations before uninstall
-#   community.general.archive:
-#     path: "{{ ovos_directories_backup }}"
-#     dest: "{{ ovos_installer_user_home }}/ovos-backup.tar.gz"
-#     owner: "{{ ovos_installer_user }}"
-#     group: "{{ ovos_installer_group }}"
-#     mode: "0755"    
-#     format: gz
-#     force_archive: true
-#   tags:
-#     - uninstall
+- name: Backup existing configurations before uninstall
+  community.general.archive:
+    path: "{{ ovos_directories_backup }}"
+    dest: "{{ ovos_installer_user_home }}/ovos-backup.tar.gz"
+    owner: "{{ ovos_installer_user }}"
+    group: "{{ ovos_installer_group }}"
+    mode: "0755"
+    format: gz
+    force_archive: true
+  when: ovos_installer_cleaning | bool
+  tags:
+    - uninstall
 
 - name: Create directories
   ansible.builtin.file:
diff --git a/setup.sh b/setup.sh
index dc1d17f2..c6ee0aa6 100755
--- a/setup.sh
+++ b/setup.sh
@@ -48,9 +48,6 @@ i2c_scan
 trap "" ERR
 set +eE
 
-# Set default Ansible tag
-#ansible_tags=(--tags unttaged)
-
 if [ "$SCENARIO_FOUND" == "false" ]; then
   # shellcheck source=tui/language.sh
   source tui/language.sh