diff --git a/modules/servers/baldur/crafty-controller.nix b/modules/servers/baldur/crafty-controller.nix
index 763cdf9..759f1c2 100644
--- a/modules/servers/baldur/crafty-controller.nix
+++ b/modules/servers/baldur/crafty-controller.nix
@@ -38,4 +38,9 @@
       entrypoints = "websecure";
     };
   };
+
+  services.restic.backups = {
+    local.paths = ["/var/lib/crafty-controller"];
+    server.paths = ["/var/lib/crafty-controller"];
+  };
 }
diff --git a/modules/servers/bragi/audiobookshelf.nix b/modules/servers/bragi/audiobookshelf.nix
index acbd2b3..b0b9242 100644
--- a/modules/servers/bragi/audiobookshelf.nix
+++ b/modules/servers/bragi/audiobookshelf.nix
@@ -19,4 +19,9 @@
       entrypoints = "websecure";
     };
   };
+
+  services.restic.backups = {
+    local.paths = ["/var/lib/audiobookshelf"];
+    server.paths = ["/var/lib/audiobookshelf"];
+  };
 }
diff --git a/modules/servers/bragi/navidrome.nix b/modules/servers/bragi/navidrome.nix
index 792f91d..f2a99b5 100644
--- a/modules/servers/bragi/navidrome.nix
+++ b/modules/servers/bragi/navidrome.nix
@@ -24,4 +24,9 @@
       entrypoints = "websecure";
     };
   };
+
+  services.restic.backups = {
+    local.paths = ["/var/lib/navidrome"];
+    server.paths = ["/var/lib/navidrome"];
+  };
 }
diff --git a/modules/servers/freyja/immich.nix b/modules/servers/freyja/immich.nix
index c7d9b16..33d66a6 100644
--- a/modules/servers/freyja/immich.nix
+++ b/modules/servers/freyja/immich.nix
@@ -24,4 +24,16 @@
       entrypoints = "websecure";
     };
   };
+
+  services.postgresqlBackup = {
+    enable = true;
+    databases = [
+      "immich"
+    ];
+  };
+
+  services.restic.backups = {
+    local.paths = ["/var/lib/immich" "/var/backup/postgresql"];
+    server.paths = ["/var/lib/immich" "/var/backup/postgresql"];
+  };
 }
diff --git a/modules/servers/general/restic.nix b/modules/servers/general/restic.nix
index 88b435b..17b1544 100644
--- a/modules/servers/general/restic.nix
+++ b/modules/servers/general/restic.nix
@@ -27,8 +27,8 @@ in {
     server = {
       initialize = true;
       passwordFile = config.age.secrets.restic-server-pass.path;
-      repositoryFile = config.age.secrets.restic-server-pass.path;
-      environmentFile = config.age.secrets.restic-server-pass.path;
+      repositoryFile = config.age.secrets.restic-server-repo.path;
+      environmentFile = config.age.secrets.restic-server-env.path;
       paths = opts.paths;
       pruneOpts = opts.pruneOpts;
       checkOpts = opts.checkOpts;
diff --git a/modules/servers/heimdall/beszel-hub.nix b/modules/servers/heimdall/beszel-hub.nix
index 0504331..4b53351 100644
--- a/modules/servers/heimdall/beszel-hub.nix
+++ b/modules/servers/heimdall/beszel-hub.nix
@@ -44,4 +44,9 @@
       entrypoints = "websecure";
     };
   };
+
+  services.restic.backups = {
+    local.paths = ["/var/lib/beszel"];
+    server.paths = ["/var/lib/beszel"];
+  };
 }
diff --git a/modules/servers/odin/miniflux.nix b/modules/servers/odin/miniflux.nix
index abdd740..d302e84 100644
--- a/modules/servers/odin/miniflux.nix
+++ b/modules/servers/odin/miniflux.nix
@@ -25,4 +25,14 @@
       entrypoints = "websecure";
     };
   };
+
+  services.postgresqlBackup = {
+    enable = true;
+    databases = ["miniflux"];
+  };
+
+  services.restic.backups = {
+    local.paths = ["/var/backup/postgresql"];
+    server.paths = ["/var/backup/postgresql"];
+  };
 }
diff --git a/modules/servers/odin/syncyomi.nix b/modules/servers/odin/syncyomi.nix
index 4e40953..a55152a 100644
--- a/modules/servers/odin/syncyomi.nix
+++ b/modules/servers/odin/syncyomi.nix
@@ -26,4 +26,9 @@
       entrypoints = "websecure";
     };
   };
+
+  services.restic.backups = {
+    local.paths = ["/var/lib/syncyomi"];
+    server.paths = ["/var/lib/syncyomi"];
+  };
 }
diff --git a/modules/servers/odin/upfast.nix b/modules/servers/odin/upfast.nix
index 772489f..6e3d98a 100644
--- a/modules/servers/odin/upfast.nix
+++ b/modules/servers/odin/upfast.nix
@@ -54,4 +54,9 @@
       entrypoints = "websecure";
     };
   };
+
+  services.restic.backups = {
+    local.paths = ["/var/lib/upfast"];
+    server.paths = ["/var/lib/upfast"];
+  };
 }
diff --git a/modules/servers/odin/wallabag.nix b/modules/servers/odin/wallabag.nix
index ebdc746..30c2e38 100644
--- a/modules/servers/odin/wallabag.nix
+++ b/modules/servers/odin/wallabag.nix
@@ -30,4 +30,9 @@
       entrypoints = "websecure";
     };
   };
+
+  services.restic.backups = {
+    local.paths = ["/var/lib/wallabag"];
+    server.paths = ["/var/lib/wallabag"];
+  };
 }
diff --git a/modules/servers/thor/changedetection-io.nix b/modules/servers/thor/changedetection-io.nix
index 929af56..b8a9aab 100644
--- a/modules/servers/thor/changedetection-io.nix
+++ b/modules/servers/thor/changedetection-io.nix
@@ -22,4 +22,9 @@
       entrypoints = "websecure";
     };
   };
+
+  services.restic.backups = {
+    local.paths = ["/var/lib/changedetection-io"];
+    server.paths = ["/var/lib/changedetection-io"];
+  };
 }
diff --git a/modules/servers/thor/forgejo.nix b/modules/servers/thor/forgejo.nix
index 5e11c24..1a60bfd 100644
--- a/modules/servers/thor/forgejo.nix
+++ b/modules/servers/thor/forgejo.nix
@@ -38,4 +38,9 @@
       AllowUsers = ["forgejo"];
     };
   };
+
+  services.restic.backups = {
+    local.paths = ["/var/lib/forgejo"];
+    server.paths = ["/var/lib/forgejo"];
+  };
 }
diff --git a/modules/servers/thor/lemmy.nix b/modules/servers/thor/lemmy.nix
index 3ad9f02..c78b40c 100644
--- a/modules/servers/thor/lemmy.nix
+++ b/modules/servers/thor/lemmy.nix
@@ -15,4 +15,9 @@
       entrypoints = "websecure";
     };
   };
+
+  services.restic.backups = {
+    local.paths = ["/var/lib/lemmy"];
+    server.paths = ["/var/lib/lemmy"];
+  };
 }