diff --git a/roles/borgmatic/tasks/main.yml b/roles/borgmatic/tasks/main.yml
index a28fc37..e70d0d1 100644
--- a/roles/borgmatic/tasks/main.yml
+++ b/roles/borgmatic/tasks/main.yml
@@ -60,3 +60,19 @@
     cmd: borgmatic init --encryption repokey
   register: borgmatic_init
   changed_when: borgmatic_init.stderr != ''
+
+- name: Stop and disable borgmatic timer
+  become: true
+  ansible.builtin.systemd:
+    name: borgmatic.timer
+    state: stopped
+    enabled: false
+
+- name: Copy borgmatic cron
+  become: true
+  ansible.builtin.template:
+    src: cron.d/borgmatic.j2
+    dest: /etc/cron.d/borgmatic
+    owner: root
+    group: root
+    mode: 0644
diff --git a/roles/borgmatic/templates/cron.d/borgmatic.j2 b/roles/borgmatic/templates/cron.d/borgmatic.j2
new file mode 100644
index 0000000..a78d99d
--- /dev/null
+++ b/roles/borgmatic/templates/cron.d/borgmatic.j2
@@ -0,0 +1,3 @@
+# {{ ansible_managed }}
+
+0 3 * * * root /usr/bin/borgmatic
diff --git a/roles/forgejo/tasks/backup.yml b/roles/forgejo/tasks/backup.yml
index 3a23915..9bd3c24 100644
--- a/roles/forgejo/tasks/backup.yml
+++ b/roles/forgejo/tasks/backup.yml
@@ -17,19 +17,3 @@
     owner: git
     group: git
     mode: 0755
-
-- name: Create forgejo-backup log directory
-  become: true
-  ansible.builtin.file:
-    path: "{{ forgejo_backup_log_dir }}"
-    state: directory
-    owner: git
-    group: git
-    mode: 0755
-
-- name: Setup forgejo-backup crontab
-  become: true
-  ansible.builtin.template:
-    src: cron.d/forgejo-backup.j2
-    dest: /etc/cron.d/forgejo-backup
-    mode: 0644
diff --git a/roles/forgejo/templates/cron.d/forgejo-backup.j2 b/roles/forgejo/templates/cron.d/forgejo-backup.j2
deleted file mode 100644
index 2a852b0..0000000
--- a/roles/forgejo/templates/cron.d/forgejo-backup.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-# {{ ansible_managed }}
-
-0 5 * * * git USER=git /usr/local/bin/forgejo-backup.sh backup >> {{ forgejo_backup_log_dir }}/backup.log 2>&1 && USER=git /usr/local/bin/forgejo-backup.sh prune 2 >> {{ forgejo_backup_log_dir }}/prune.log 2>&1