diff --git a/modules/services/auth/kanidm.nix b/modules/services/auth/kanidm.nix
index b73609f..9801f6c 100644
--- a/modules/services/auth/kanidm.nix
+++ b/modules/services/auth/kanidm.nix
@@ -14,6 +14,12 @@
 
       tls_chain = "${config.security.acme.certs.${config.homelab.authDomain}.directory}/cert.pem";
       tls_key = "${config.security.acme.certs.${config.homelab.authDomain}.directory}/key.pem";
+
+      online_backup = {
+        schedule =  "00 22 * * *";
+        path = "/media/apps/kanidm";
+        versions = 14;
+      };
     };
   };
 
diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix
index 14a06e9..3793da0 100644
--- a/modules/services/forgejo.nix
+++ b/modules/services/forgejo.nix
@@ -3,8 +3,8 @@
 {
   services.forgejo = {
     enable = true;
-    stateDir = "/media/git";
-    repositoryRoot = "${config.services.forgejo.stateDir}/repositories";
+    stateDir = "/media/apps/git";
+    repositoryRoot = "${config.services.forgejo.stateDir}/repos";
     database.createDatabase = true;
     
     settings = {
diff --git a/modules/services/media/arr.nix b/modules/services/media/arr.nix
index 34310de..eae371c 100644
--- a/modules/services/media/arr.nix
+++ b/modules/services/media/arr.nix
@@ -8,7 +8,7 @@
   services.radarr = {
     enable = true;
     openFirewall = false;
-    dataDir = "/var/lib/radarr";
+    dataDir = "/media/apps/radarr";
     group = "media";
   };
 
@@ -29,7 +29,7 @@
   services.sonarr = {
     enable = true;
     openFirewall = false;
-    dataDir = "/var/lib/sonarr";
+    dataDir = "/media/apps/sonarr";
     group = "media";
   };
 
@@ -49,6 +49,7 @@
   services.prowlarr = {
     enable = true;
     openFirewall = false;
+    dataDir = "/media/apps/prowlarr";
   };
 
   services.caddy.virtualHosts."prowlarr.${config.homelab.domain}" = {
@@ -66,6 +67,7 @@
   # Downloading torrents
   services.deluge = {
     enable = true;
+    dataDir = "/media/apps/deluge";
     web.enable = true;
     web.openFirewall = false;
     group = "media";
diff --git a/modules/services/media/jellyfin.nix b/modules/services/media/jellyfin.nix
index a314b4b..bd93c70 100644
--- a/modules/services/media/jellyfin.nix
+++ b/modules/services/media/jellyfin.nix
@@ -6,6 +6,7 @@
     enable = true;
     openFirewall = false;
     group = "media";
+    dataDir = "/media/apps/jellyfin";
   };
 
   users.users.jellyfin.extraGroups = [ "render" "video" ];