diff --git a/basic-system/defaults/main.yml b/basic-system/defaults/main.yml
index eda3f1326c123c6e3cfbaa62d58345423aaaee5b..94731f21a8f1af048f8ae4c331eb238089230b46 100644
--- a/basic-system/defaults/main.yml
+++ b/basic-system/defaults/main.yml
@@ -3,3 +3,4 @@
 dns_hostname_fqdn: false
 hosts_alternates: []
 hosts_additionals: []
+etckeeper: true
diff --git a/basic-system/tasks/main.yml b/basic-system/tasks/main.yml
index a66f91614cf737083ffb25ed3d994171e1994cd3..427063a763b51f426eca2ca03653edb6cd14eebc 100644
--- a/basic-system/tasks/main.yml
+++ b/basic-system/tasks/main.yml
@@ -20,6 +20,14 @@
     - lsb
 - meta: flush_handlers
 
+- name: Install etckeeper
+  apt:
+    name: etckeeper
+    state: present
+  when: etckeeper
+  tags:
+    - etckeeper
+
 - include: logging.yml
 - meta: flush_handlers
 - include: network.yml