diff --git a/roles/borgbackup-client/tasks/main.yml b/roles/borgbackup-client/tasks/main.yml
index 2e68a2ae..8b5a68d6 100644
--- a/roles/borgbackup-client/tasks/main.yml
+++ b/roles/borgbackup-client/tasks/main.yml
@@ -9,7 +9,7 @@
   retries: 3
   until: apt_result is succeeded
 
-- name: Install borgbackup
+- name: Install borgmatic with apt
   apt:
     update_cache: true
     name:
@@ -19,10 +19,20 @@
   retries: 3
   until: apt_result is succeeded
   when: ansible_lsb.release >= 10
+
+- name: Install borgmatic with pip
+  pip:
+    executable: pip3
+    name:
+      - borgmatic
+  register: pip_result
+  retries: 3
+  until: pip_result is succeeded
+  when: ansible_lsb.release <= 9
   
-- name: Ensures /etc/borgbackup exists
+- name: Ensures /etc/borgmatic exists
   file:
-    path: /etc/borgbackup
+    path: /etc/borgmatic
     state: directory
     mode: 0700
     owner: root
@@ -34,22 +44,13 @@
     mode: 0600
     owner: root
 
-- name: Deploy borgbackup script
-  template:
-    src: "borgbackup/backup.sh.j2"
-    dest: "/etc/borgbackup/backup.sh"
-    mode: 0700
-    owner: root
-  when: ansible_lsb.release <= 9
-
 - name: Deploy borgmatic config
   template:
-    src: "borgbackup/config.yaml.j2"
-    dest: "/etc/borgbackup/config.yaml"
-  when: ansible_lsb.release >= 10
+    src: "borgmatic/config.yaml.j2"
+    dest: "/etc/borgmatic/config.yaml"
 
 - name: Deploy borg cron
   template:
-    src: "cron.d/borgbackup.j2"
-    dest: "/etc/cron.d/borgbackup"
+    src: "cron.d/borg.j2"
+    dest: "/etc/cron.d/borg"
 
diff --git a/roles/borgbackup-client/templates/borgbackup/backup.sh.j2 b/roles/borgbackup-client/templates/borgmatic/config.yaml.j2
similarity index 100%
rename from roles/borgbackup-client/templates/borgbackup/backup.sh.j2
rename to roles/borgbackup-client/templates/borgmatic/config.yaml.j2
diff --git a/roles/borgbackup-client/templates/borgbackup/id_ed25519.j2 b/roles/borgbackup-client/templates/borgmatic/id_ed25519.j2
similarity index 100%
rename from roles/borgbackup-client/templates/borgbackup/id_ed25519.j2
rename to roles/borgbackup-client/templates/borgmatic/id_ed25519.j2