diff --git a/roles/borgbackup-client/tasks/main.yml b/roles/borgbackup-client/tasks/main.yml
index 2325ea27..3bdd417a 100644
--- a/roles/borgbackup-client/tasks/main.yml
+++ b/roles/borgbackup-client/tasks/main.yml
@@ -6,7 +6,10 @@
   loop:
     - sources.list.d/bullseye.list
     - preferences.d/borgmatic-bullseye
-  when: ansible_lsb.release | int <= 10
+  when:
+    - ansible_distribution == "Debian"
+    - ansible_distribution_major_version | int <= 10
+    - ansible_distribution_release != "bullseye"
 
 - name: Install borgbackup
   apt:
@@ -25,7 +28,7 @@
     state: directory
     mode: 0700
     owner: root
-  
+
 - name: Deploy ssh private key
   template:
     src: "borgmatic/id_ed25519_borg.j2"