diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml
index e0c91fd1..37cc826d 100644
--- a/evolinux-base/defaults/main.yml
+++ b/evolinux-base/defaults/main.yml
@@ -10,6 +10,21 @@ logcheck_alert_email: Null
 raid_alert_email: Null
 postfix_alias_email: Null
 
+# apt
+
+evolinux_apt_include: True
+
+evolinux_apt_conf: True
+evolinux_apt_hooks: True
+evolinux_apt_replace_default_sources: True
+evolinux_apt_public_sources: True
+evolinux_apt_upgrade: True
+evolinux_apt_remove_aptitude: True
+
+# etc-git
+
+evolinux_etcgit_include: True
+
 # hostname
 
 evolinux_hostname_include: True
@@ -31,17 +46,6 @@ evolinux_kernel_disable_tcp_timestamps: True
 evolinux_kernel_reduce_swapiness: True
 evolinux_kernel_cve20165696: True
 
-# apt
-
-evolinux_apt_include: True
-
-evolinux_apt_conf: True
-evolinux_apt_hooks: True
-evolinux_apt_replace_default_sources: True
-evolinux_apt_public_sources: True
-evolinux_apt_upgrade: True
-evolinux_apt_remove_aptitude: True
-
 # fstab
 
 evolinux_fstab_include: True
diff --git a/evolinux-base/tasks/main.yml b/evolinux-base/tasks/main.yml
index 5c1ad594..f44cfa11 100644
--- a/evolinux-base/tasks/main.yml
+++ b/evolinux-base/tasks/main.yml
@@ -5,6 +5,15 @@
   when:
   - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<')
 
+- name: Apt configuration
+  include: apt.yml
+  when: evolinux_apt_include
+
+- name: /etc versioning with Git
+  include_role:
+    name: etc-git
+  when: evolinux_etcgit_include
+
 - name: Hostname
   include: hostname.yml
   when: evolinux_hostname_include
@@ -13,10 +22,6 @@
   include: kernel.yml
   when: evolinux_kernel_include
 
-- name: Apt configuration and packages install
-  include: apt.yml
-  when: evolinux_apt_include
-
 - name: Fstab configuration
   include: fstab.yml
   when: evolinux_fstab_include