diff --git a/home/dot_config/borgmatic.d/kestrel_bulk.yaml b/home/dot_config/borgmatic.d/kestrel_bulk.yaml
new file mode 100644
index 00000000..1434859b
--- /dev/null
+++ b/home/dot_config/borgmatic.d/kestrel_bulk.yaml
@@ -0,0 +1,15 @@
+source_directories:
+    - "/home/tstarr"
+
+exclude_patterns:
+    - "/home/tstarr/.?*"
+    - "/home/tstarr/mnt"
+    - "/home/tstarr/tmp"
+    - "/home/tstarr/sync"
+    - "/home/tstarr/media/roms"
+    - "/home/tstarr/box"
+    - "/home/tstarr/Downloads"
+
+archive_name_format: 'kestrel_bulk.borg-{now}'
+
+<<: !include kestrel_common.yaml
diff --git a/home/dot_config/borgmatic.d/kestrel_common.yaml b/home/dot_config/borgmatic.d/kestrel_common.yaml
index b053852d..d39baaa6 100644
--- a/home/dot_config/borgmatic.d/kestrel_common.yaml
+++ b/home/dot_config/borgmatic.d/kestrel_common.yaml
@@ -1,15 +1,7 @@
-source_directories:
-    - "/home/tstarr"
-
-exclude_patterns:
-    - "/home/tstarr/.?*"
-    - "/home/tstarr/mnt"
-    - "/home/tstarr/tmp"
-    - "/home/tstarr/sync"
-    - "/home/tstarr/media/roms"
-    - "/home/tstarr/box"
-    - "/home/tstarr/Downloads"
-
-archive_name_format: 'kestrel.borg-{now}'
+repositories:
+  - path: ssh://tstarr@torus//engi/store/kestrel.borg
+    label: torus
+  - path: ssh://fm2120@fm2120.rsync.net//data2/home/fm2120/store/kestrel.borg
+    label: rsync
 
 <<: !include common.yaml
diff --git a/home/dot_config/borgmatic.d/kestrel_rsync.yaml b/home/dot_config/borgmatic.d/kestrel_rsync.yaml
deleted file mode 100644
index 69d3f023..00000000
--- a/home/dot_config/borgmatic.d/kestrel_rsync.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-repositories:
-  - path: ssh://fm2120@fm2120.rsync.net//data2/home/fm2120/store/kestrel.borg
-    label: rsync
-
-remote_path: borg1
-
-<<: !include kestrel_common.yaml
diff --git a/home/dot_config/borgmatic.d/kestrel_torus.yaml b/home/dot_config/borgmatic.d/kestrel_torus.yaml
deleted file mode 100644
index 982d2622..00000000
--- a/home/dot_config/borgmatic.d/kestrel_torus.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-repositories:
-  - path: ssh://tstarr@torus//engi/store/kestrel.borg
-    label: torus
-
-<<: !include kestrel_common.yaml
diff --git a/home/dot_config/borgmatic.d/torus_apps.yaml b/home/dot_config/borgmatic.d/torus_apps.yaml
new file mode 100644
index 00000000..dee39861
--- /dev/null
+++ b/home/dot_config/borgmatic.d/torus_apps.yaml
@@ -0,0 +1,17 @@
+source_directories:
+    - /engi/apps
+    
+exclude_patterns:
+    - '**/code-server/config/**'
+    - '**/code-server/workspace/**'
+    - '**/immich/library/**'
+
+before_backup:
+  - stop-docker-containers
+
+after_backup:
+  - restore-docker-containers
+
+archive_name_format: 'torus_apps.borg-{now}'
+
+<<: !include torus_common.yaml
diff --git a/home/dot_config/borgmatic.d/torus_bulk.yaml b/home/dot_config/borgmatic.d/torus_bulk.yaml
new file mode 100644
index 00000000..2663b29d
--- /dev/null
+++ b/home/dot_config/borgmatic.d/torus_bulk.yaml
@@ -0,0 +1,11 @@
+source_directories:
+    - /engi/backup # Static files and service dumps
+    #- /home/tstarr/Sync # Syncthing files
+    
+before_backup:
+  - "tree /engi > /engi/backup/tree.txt"
+  - sudo -u gitea backup-dump-gitea
+
+archive_name_format: 'torus_bulk.borg-{now}'
+
+<<: !include torus_common.yaml
diff --git a/home/dot_config/borgmatic.d/torus_common.yaml b/home/dot_config/borgmatic.d/torus_common.yaml
index ee624cb8..7fb9a7da 100644
--- a/home/dot_config/borgmatic.d/torus_common.yaml
+++ b/home/dot_config/borgmatic.d/torus_common.yaml
@@ -1,13 +1,7 @@
-source_directories:
-    - /engi/apps # Docker containers and data
-    #- /engi/backup # Static files and service dumps
-    #- /home/tstarr/Sync # Syncthing files on Torus
-
-exclude_patterns:
-    - '**/code-server/config/**'
-    - '**/code-server/workspace/**'
-    - '**/immich/library/**'
-
-archive_name_format: 'torus.borg-{now}'
+repositories:
+  - path: /media/clone/store/torus.borg
+    label: drive 
+  - path: ssh://fm2120@fm2120.rsync.net//data2/home/fm2120/store/torus.borg
+    label: rsync
 
 <<: !include common.yaml
diff --git a/home/dot_config/borgmatic.d/torus_kestrel.yaml b/home/dot_config/borgmatic.d/torus_kestrel.yaml
deleted file mode 100644
index a47ff429..00000000
--- a/home/dot_config/borgmatic.d/torus_kestrel.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-repositories:
-  - path: ssh://tstarr@kestrel//store/torus.borg
-    label: kestrel
-
-before_backup:
-  - "tree /engi > /engi/backup/tree.txt"
-  #- sudo -u gitea backup-dump-gitea
-  - stop-docker-containers
-
-<<: !include torus_common.yaml
diff --git a/home/dot_config/borgmatic.d/torus_rsync.yaml b/home/dot_config/borgmatic.d/torus_rsync.yaml
deleted file mode 100644
index a1fb42fb..00000000
--- a/home/dot_config/borgmatic.d/torus_rsync.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-repositories:
-  - path: ssh://fm2120@fm2120.rsync.net//data2/home/fm2120/store/torus.borg
-    label: rsync
-
-after_backup:
-  - restore-docker-containers
-
-remote_path: borg1
-
-<<: !include torus_common.yaml