diff --git a/plays/backup.yml b/plays/backup.yml
index 1949a5ca..25272c4c 100755
--- a/plays/backup.yml
+++ b/plays/backup.yml
@@ -1,15 +1,5 @@
 #!/usr/bin/env ansible-playbook
 ---
 
-- hosts: server
-  vars:
-    borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}'
-    mirror: '{{ glob_mirror | default({}) | combine(loc_mirror | default({})) }}'
-  roles:
-    - borgbackup-client
-
-- hosts: backups
-  vars:
-    borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}'
-  roles:
-    - borgbackup-server
+- import_playbook: borgbackup_client.yml
+- import_playbook: borgbackup_server.yml
diff --git a/plays/borgbackups_client.yml b/plays/borgbackups_client.yml
new file mode 100755
index 00000000..1949a5ca
--- /dev/null
+++ b/plays/borgbackups_client.yml
@@ -0,0 +1,15 @@
+#!/usr/bin/env ansible-playbook
+---
+
+- hosts: server
+  vars:
+    borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}'
+    mirror: '{{ glob_mirror | default({}) | combine(loc_mirror | default({})) }}'
+  roles:
+    - borgbackup-client
+
+- hosts: backups
+  vars:
+    borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}'
+  roles:
+    - borgbackup-server
diff --git a/plays/borgbackups_server.yml b/plays/borgbackups_server.yml
new file mode 100755
index 00000000..1949a5ca
--- /dev/null
+++ b/plays/borgbackups_server.yml
@@ -0,0 +1,15 @@
+#!/usr/bin/env ansible-playbook
+---
+
+- hosts: server
+  vars:
+    borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}'
+    mirror: '{{ glob_mirror | default({}) | combine(loc_mirror | default({})) }}'
+  roles:
+    - borgbackup-client
+
+- hosts: backups
+  vars:
+    borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}'
+  roles:
+    - borgbackup-server
diff --git a/plays/root.yml b/plays/root.yml
index 8c5c376c..e4bb12ae 100755
--- a/plays/root.yml
+++ b/plays/root.yml
@@ -84,11 +84,5 @@
       retries: 3
       until: apt_result is succeeded
 
-- hosts: server
-  vars:
-    borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}'
-    mirror: '{{ glob_mirror | default({}) | combine(loc_mirror | default({})) }}'
-  roles:
-    - borgbackup-client
-
+- import_playbook: borgbackup_client.yml
 - import_playbook: monitoring.yml
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"
diff --git a/roles/borgbackup-server/tasks/main.yml b/roles/borgbackup-server/tasks/main.yml
index 052347d5..fc501928 100644
--- a/roles/borgbackup-server/tasks/main.yml
+++ b/roles/borgbackup-server/tasks/main.yml
@@ -30,6 +30,7 @@
     src: "authorized_keys.j2"
     dest: "/var/lib/borg/.ssh/authorized_keys"
     mode: 0600
+    owner: borg
 
 - name: Indicate role in motd
   template: