diff --git a/basic-system/tasks/main.yml b/basic-system/tasks/main.yml
index 427063a763b51f426eca2ca03653edb6cd14eebc..93a6c3ca41efe49495062595f22af543d50291d1 100644
--- a/basic-system/tasks/main.yml
+++ b/basic-system/tasks/main.yml
@@ -28,6 +28,14 @@
   tags:
     - etckeeper
 
+- name: Uninstall etckeeper
+  apt:
+    name: etckeeper
+    state: absent
+  when: not etckeeper
+  tags:
+    - etckeeper
+
 - include: logging.yml
 - meta: flush_handlers
 - include: network.yml