diff --git a/playbooks/clean.yml b/playbooks/clean.yml
index 1e2b2bc..f5c8d90 100644
--- a/playbooks/clean.yml
+++ b/playbooks/clean.yml
@@ -3,11 +3,34 @@
   gather_facts: no
   tasks:
   - name: Delete awx-user
-    ansible.builtin.user:
+    user:
       name: awx-user
       state: absent
       remove: yes
+    tags: [awx]
   - name: Delete awx-user sudoers file
     file:
       path: /etc/sudoers.d/awx-user
       state: absent
+    tags: [awx]
+  - name: Delete old MOTD configuration
+    file:
+      path: /etc/profile.d/mymotd.sh
+      state: absent
+    tags: [motd]
+  - name: Delete old Ansible bashrc configuration
+    blockinfile:
+      path: /root/.bashrc
+      marker_begin: 'BEGIN ANSIBLE MANAGED BLOCK'
+      marker_end: 'END ANSIBLE MANAGED BLOCK'
+      marker: "# {mark}"
+      state: absent
+    tags: [bashrc]
+  - name: Delete old custom bashrc configuration
+    replace:
+      path: /root/.bashrc
+      regexp: '{{ start_delimiter }}[\\s\\S]*?{{ end_delimiter }}'
+      replace: ''
+    vars:
+      start_delimiter: '### 4Loo'
+      end_delimiter: 'esac'
diff --git a/roles/debian-base/tasks/vim.yml b/roles/debian-base/tasks/vim.yml
index 3b4a32a..d89ef6f 100644
--- a/roles/debian-base/tasks/vim.yml
+++ b/roles/debian-base/tasks/vim.yml
@@ -1,4 +1,4 @@
-- name: Install packages
+- name: Install vim packages
   apt:
     name: vim
     state: present