diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0ac6ab..2eb9614 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 ---------
 
+*6.0.4*
+
+- Use the buster-backports repository on Debian Buster (or older), use package
+  standard repositories on sid/bullseye.
+
 **6.0.3**
 
 - If `wg syncconf` command is not available do stop/start service instead of restart (contribution by @cristichiru)
diff --git a/tasks/setup-debian.yml b/tasks/setup-debian.yml
index 4f8ad1f..b6e2f34 100644
--- a/tasks/setup-debian.yml
+++ b/tasks/setup-debian.yml
@@ -14,11 +14,12 @@
     name: gnupg
     state: present
 
-- name: Add WireGuard repository
+- name: Add WireGuard repository on buster or earlier
   apt_repository:
     repo: "deb http://deb.debian.org/debian buster-backports main"
     state: present
     update_cache: yes
+  when: ansible_distribution_version | int <= 10
   tags:
     - wg-install