diff --git a/tasks/setup-debian-raspbian.yml b/tasks/setup-debian-raspbian-buster.yml
similarity index 90%
rename from tasks/setup-debian-raspbian.yml
rename to tasks/setup-debian-raspbian-buster.yml
index 593966e..a687ea8 100644
--- a/tasks/setup-debian-raspbian.yml
+++ b/tasks/setup-debian-raspbian-buster.yml
@@ -2,6 +2,12 @@
 # Copyright (C) 2020 Stefan Haun
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+# Note: This setup is called for Raspbian 10 (Buster) and lower.
+#       Since Raspbian 11 (Bullseye) wireguard is supported out
+#       of the box.
+#       Any Raspbian-related changes for Bullseye and above need to
+#       go to a separate playbook.
+
 - name: (Raspbian) Install GPG - required to add WireGuard key
   ansible.builtin.apt:
     name: gnupg
diff --git a/tasks/setup-debian.yml b/tasks/setup-debian.yml
index 4af334c..3fe7ae2 100644
--- a/tasks/setup-debian.yml
+++ b/tasks/setup-debian.yml
@@ -5,11 +5,14 @@
 
 - name: Setup for Raspbian
   ansible.builtin.include_tasks:
-    file: "setup-debian-raspbian.yml"
+    file: "setup-debian-raspbian-buster.yml"
     apply:
       tags:
         - wg-install
-  when: ansible_lsb.id is defined and ansible_lsb.id == "Raspbian"
+  when:
+  - ansible_lsb.id is defined
+  - ansible_lsb.id == "Raspbian"
+  - ansible_lsb.major_release is version('11', '<')
   register: wireguard__register_raspbian_setup
 
 - name: Setup for Proxmox VE variants