diff --git a/apt-repositories/README.md b/apt-repositories/README.md
index af7876b0..7eaff8b5 100644
--- a/apt-repositories/README.md
+++ b/apt-repositories/README.md
@@ -11,10 +11,10 @@ Tasks are extracted in several files, included in `tasks/main.yml` :
 
 ## Available variables
 
+* `apt_repositories_install_basics` : change basic sources components (default: `True`) ;
+* `apt_repositories_basics_components` : basic sources components (default: `main`) ;
 * `apt_repositories_install_backports` : install backports sources (default: `False`) ;
 * `apt_repositories_backports_components` : backports sources (default: `main`) ;
-* `apt_repositories_change_basics_components` : change basic sources components (default: `False`) ;
-* `apt_repositories_backports_components` : basic sources components (default: `main`) ;
 * `apt_repositories_install_evolix_public` : install Evolix public repositories (default: `True`).
 
 ## Examples
@@ -23,7 +23,7 @@ To add "non-free" and "contrib" components to basic sources lists :
 
 ```
 { role: apt-repositories,
-    apt_repositories_change_basics_components: True,
+    apt_repositories_install_basics: True,
     apt_repositories_basics_components: "main non-free contrib"
 }
 ```
@@ -49,7 +49,7 @@ To install backports sources lists and have "non-free" and "contrib" for each re
 
 ```
 { role: apt-repositories,
-    apt_repositories_change_basics_components: True,
+    apt_repositories_install_basics: True,
     apt_repositories_basics_components: "main non-free contrib",
     apt_repositories_install_backports: True,
     apt_repositories_backports_components: "main non-free contrib"
diff --git a/apt-repositories/defaults/main.yml b/apt-repositories/defaults/main.yml
index 08a79106..47c3016f 100644
--- a/apt-repositories/defaults/main.yml
+++ b/apt-repositories/defaults/main.yml
@@ -1,4 +1,4 @@
-apt_repositories_change_basics_components: True
+apt_repositories_install_basics: True
 apt_repositories_basics_components: "main"
 
 apt_repositories_install_backports: False
diff --git a/apt-repositories/tasks/backports.yml b/apt-repositories/tasks/backports.yml
index 87cf7253..a4f84735 100644
--- a/apt-repositories/tasks/backports.yml
+++ b/apt-repositories/tasks/backports.yml
@@ -1,5 +1,5 @@
 ---
-- name: No backports config in default source.list
+- name: No backports config in default sources.list
   lineinfile:
     dest: /etc/apt/sources.list
     regexp: "backports"
diff --git a/apt-repositories/tasks/basics_components.yml b/apt-repositories/tasks/basics.yml
similarity index 67%
rename from apt-repositories/tasks/basics_components.yml
rename to apt-repositories/tasks/basics.yml
index 681744e3..67333191 100644
--- a/apt-repositories/tasks/basics_components.yml
+++ b/apt-repositories/tasks/basics.yml
@@ -1,10 +1,11 @@
 ---
 
-- name: Change basic repositories components
+- name: Change basics repositories
   template:
-    src: basics_components.list.j2
+    src: basics.list.j2
     dest: /etc/apt/sources.list
     mode: "0644"
+    force: yes
     backup: yes
   notify: apt update
 
diff --git a/apt-repositories/tasks/main.yml b/apt-repositories/tasks/main.yml
index f1d52df1..09a46c5c 100644
--- a/apt-repositories/tasks/main.yml
+++ b/apt-repositories/tasks/main.yml
@@ -7,22 +7,22 @@
   - ansible_distribution_release != "jessie"
   - ansible_distribution_release != "stretch"
   tags:
-  - apt-repository
+  - apt-repositories
 
-- name: Add components to basic repositories
-  include: basics_components.yml
-  when: apt_repositories_change_basics_components
+- name: Install basics repositories
+  include: basics.yml
+  when: apt_repositories_install_basics
   tags:
-  - apt-repository
+  - apt-repositories
 
 - name: Install APT Backports repository
   include: backports.yml
   when: apt_repositories_install_backports
   tags:
-  - apt-repository
+  - apt-repositories
 
 - name: Install Evolix Public APT repository
   include: evolix_public.yml
   when: apt_repositories_install_evolix_public
   tags:
-  - apt-repository
+  - apt-repositories
diff --git a/apt-repositories/templates/basics_components.list.j2 b/apt-repositories/templates/basics.list.j2
similarity index 93%
rename from apt-repositories/templates/basics_components.list.j2
rename to apt-repositories/templates/basics.list.j2
index 8f03a622..a2d19e17 100644
--- a/apt-repositories/templates/basics_components.list.j2
+++ b/apt-repositories/templates/basics.list.j2
@@ -1,3 +1,5 @@
+# {{ ansible_managed }}
+
 deb http://mirror.evolix.org/debian/ {{ ansible_distribution_release }} {{ apt_repositories_basics_components | mandatory }}
 deb http://mirror.evolix.org/debian/ {{ ansible_distribution_release }}-updates {{ apt_repositories_basics_components | mandatory }}
 deb http://security.debian.org/ {{ ansible_distribution_release }}/updates {{ apt_repositories_basics_components | mandatory }}
diff --git a/apt-repositories/templates/evolix_public.list.j2 b/apt-repositories/templates/evolix_public.list.j2
index 22f17ba9..752ecd0c 100644
--- a/apt-repositories/templates/evolix_public.list.j2
+++ b/apt-repositories/templates/evolix_public.list.j2
@@ -1,2 +1,4 @@
+# {{ ansible_managed }}
+
 deb http://pub.evolix.net/ kernel/
 deb http://pub.evolix.net/ {{ ansible_distribution_release }}/
diff --git a/apt-repositories/templates/jessie_backports.list.j2 b/apt-repositories/templates/jessie_backports.list.j2
index f15e29b4..863c242c 100644
--- a/apt-repositories/templates/jessie_backports.list.j2
+++ b/apt-repositories/templates/jessie_backports.list.j2
@@ -1 +1,3 @@
+# {{ ansible_managed }}
+
 deb http://mirror.evolix.org/debian jessie-backports {{ apt_repositories_backports_components | mandatory }}
diff --git a/apt-repositories/templates/stretch_backports.list.j2 b/apt-repositories/templates/stretch_backports.list.j2
index af570679..ce887449 100644
--- a/apt-repositories/templates/stretch_backports.list.j2
+++ b/apt-repositories/templates/stretch_backports.list.j2
@@ -1 +1,3 @@
+# {{ ansible_managed }}
+
 deb http://mirror.evolix.org/debian stretch-backports {{ apt_repositories_backports_components | mandatory }}