diff --git a/nix/modules/aria/backups/borgmatic.yaml b/nix/modules/aria/backups/borgmatic.yaml
index 1f124cf..52a2528 100644
--- a/nix/modules/aria/backups/borgmatic.yaml
+++ b/nix/modules/aria/backups/borgmatic.yaml
@@ -4,7 +4,7 @@ source_directories:
     - /home/aria/Documents/other
 
 repositories:
-    - path: ssh://borg@borg.aria.rip/./aria-files
+    - path: ssh://borg@borg.doggirl.love/./aria-files
       label: backupserver
 
 numeric_ids: true
@@ -25,5 +25,12 @@ commands:
     when:
       - create
     run:
+      - systemctl --user start protonmail-bridge
+      - sleep 30
       - mbsync -a
       - notmuch new
+  - after: configuration
+    when:
+      - create
+    run:
+      - systemctl --user stop protonmail-bridge
diff --git a/nix/modules/aria/backups/default.nix b/nix/modules/aria/backups/default.nix
index ac933d1..a54da4a 100644
--- a/nix/modules/aria/backups/default.nix
+++ b/nix/modules/aria/backups/default.nix
@@ -22,6 +22,7 @@ in
     environment.home-persistence."/persist".directories = [
       ".borgmatic"
       ".config/borg"
+      ".config/protonmail/bridge-v3"
       ".mbsync"
     ];
 
@@ -29,6 +30,7 @@ in
       # Email archival
       isync
       notmuch
+      protonmail-bridge
 
       # Off-site backups
       borgbackup
@@ -44,5 +46,12 @@ in
 
     services.gnome.gnome-keyring.enable = true;
     services.gnome.gcr-ssh-agent.enable = mkForce false;
+
+    # Start the bridge manually in borgmatic pre/post hooks
+    services.protonmail-bridge.enable = true;
+    systemd.user.services.protonmail-bridge = {
+      wantedBy = mkForce [ ];
+      after = mkForce [ ];
+    };
   };
 }
diff --git a/nix/modules/aria/backups/mbsyncrc b/nix/modules/aria/backups/mbsyncrc
index b56e161..41fb74e 100644
--- a/nix/modules/aria/backups/mbsyncrc
+++ b/nix/modules/aria/backups/mbsyncrc
@@ -1,8 +1,10 @@
 IMAPAccount personal
-Host imap.mailbox.org
+Host 127.0.0.1
+Port 1143
 User me@aria.rip
 PassCmd "secret-tool lookup email 'me@aria.rip'"
-SSLType IMAPS
+TLSType STARTTLS
+CertificateFile ~/.config/protonmail/bridge-v3/cert.pem
 
 IMAPStore personal-remote
 Account personal