diff --git a/CHANGELOG.md b/CHANGELOG.md
index a042bd69..1afd398e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ The **patch** part changes incrementally at each release.
 
 ### Added
 * apt: check if cron is installed before adding a cron job
+* apt: remove jessie/buster sources from Gandi servers
 * certbot : new role to install and configure certbot
 * evocheck: upstream version 19.10
 * evolinux-base: On debian 10 and later, add noexec on /dev/shm
diff --git a/apt/tasks/basics.yml b/apt/tasks/basics.yml
index 2c736aa9..a40d0194 100644
--- a/apt/tasks/basics.yml
+++ b/apt/tasks/basics.yml
@@ -16,7 +16,9 @@
     state: absent
   with_items:
     - /etc/apt/sources.list.d/debian-security.list
+    - /etc/apt/sources.list.d/debian-jessie.list
     - /etc/apt/sources.list.d/debian-stretch.list
+    - /etc/apt/sources.list.d/debian-buster.list
     - /etc/apt/sources.list.d/debian-update.list
   when: apt_clean_gandi_sourceslist
   tags: