diff --git a/evolinux-base/README.md b/evolinux-base/README.md
index a3d8a3f2..09142d78 100644
--- a/evolinux-base/README.md
+++ b/evolinux-base/README.md
@@ -19,7 +19,7 @@ Main variables are :
 * `log2mail_alert_email`: email address to send Log2mail messages to (default: `general_alert_email`).
 * `postfix_alias_email`: email address for messages sent to root (default: `general_alert_email`) ;
 * `evolinux_apt_hooks`: install APT hooks (default: `True`)
-* `evolinux_remove_aptitude`: uninstall aptitude (default: `True`)
+* `evolinux_apt_remove_aptitude`: uninstall aptitude (default: `True`)
 * `evolinux_delete_nfs`: delete NFS tools (default: `True`)
 * `evolinux_ntp_server`: custom NTP server host or IP (default: `Null`)
 * `evolinux_additional_packages`: optional additional packages to install (default: `[]`)
diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml
index 2f0844f7..94067d1b 100644
--- a/evolinux-base/defaults/main.yml
+++ b/evolinux-base/defaults/main.yml
@@ -17,7 +17,8 @@ evolinux_internal_hostname: "{{ evolinux_hostname }}"
 
 evolinux_apt_repositories_components: "main"
 evolinux_apt_hooks: True
-evolinux_remove_aptitude: True
+evolinux_apt_remove_aptitude: True
+
 # postfix
 
 evolinux_postfix_myorigin: "{{ ansible_fqdn }}"
diff --git a/evolinux-base/tasks/apt.yml b/evolinux-base/tasks/apt.yml
index b984179b..4b60cb98 100644
--- a/evolinux-base/tasks/apt.yml
+++ b/evolinux-base/tasks/apt.yml
@@ -49,6 +49,12 @@
     backup: yes
     mode: 0640
 
+- name: Remove Aptitude
+  apt:
+    name: aptitude
+    state: absent
+  when: evolinux_apt_remove_aptitude
+
 - name: Upgrading system
   apt:
     upgrade: dist
diff --git a/evolinux-base/tasks/packages.yml b/evolinux-base/tasks/packages.yml
index f4eaa76f..bf807ed1 100644
--- a/evolinux-base/tasks/packages.yml
+++ b/evolinux-base/tasks/packages.yml
@@ -77,9 +77,3 @@
     - rpcbind
     - nfs-common
   when: evolinux_delete_nfs
-
-- name: Remove Aptitude
-  apt:
-    name: aptitude
-    state: absent
-  when: evolinux_remove_aptitude