diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc9ea7e6..bf01cbaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ The **patch** part changes incrementally at each release.
 * redmine: use custom errors-pages in Nginx vhost
 * nagios-nrpe: check_load is now based on ansible_processor_vcpus
 * php: Stop enforcing /var/www/html as chroot while we use /var/www
+* apt: Add Debian Buster repositories
 
 ### Fixed
 * rbenv: add check_mode for check rbenv and ruby versions
diff --git a/apt/templates/buster_backports.list.j2 b/apt/templates/buster_backports.list.j2
new file mode 100644
index 00000000..94303ef2
--- /dev/null
+++ b/apt/templates/buster_backports.list.j2
@@ -0,0 +1,3 @@
+# {{ ansible_managed }}
+
+deb http://mirror.evolix.org/debian buster-backports {{ apt_backports_components | mandatory }}
diff --git a/apt/templates/buster_basics.list.j2 b/apt/templates/buster_basics.list.j2
new file mode 100644
index 00000000..58209ba0
--- /dev/null
+++ b/apt/templates/buster_basics.list.j2
@@ -0,0 +1,5 @@
+# {{ ansible_managed }}
+
+deb http://mirror.evolix.org/debian buster {{ apt_basics_components | mandatory }}
+deb http://mirror.evolix.org/debian/ buster-updates {{ apt_basics_components | mandatory }}
+deb http://security.debian.org/debian-security buster/updates {{ apt_basics_components | mandatory }}