diff --git a/modules/services/backup/default.nix b/modules/services/backup/default.nix
index b5c5461..8b78db5 100644
--- a/modules/services/backup/default.nix
+++ b/modules/services/backup/default.nix
@@ -128,7 +128,11 @@ in
         "/home/*/todo"
       ] ++ cfg.exclude;
 
-      extraCreateArgs = "--exclude-caches --keep-exclude-tags --stats";
+      extraCreateArgs = [
+        "--exclude-caches"
+        "--keep-exclude-tags"
+        "--stats"
+      ];
 
       encryption = {
         mode = "repokey-blake2";
diff --git a/modules/services/nextcloud/default.nix b/modules/services/nextcloud/default.nix
index bd37689..0c333c8 100644
--- a/modules/services/nextcloud/default.nix
+++ b/modules/services/nextcloud/default.nix
@@ -164,12 +164,10 @@ in
             X-Permitted-Cross-Domain-Policies "none"
           }
 
-          # TODO: `config.services.nextcloud.package` does not contain additional apps. in nixpkgs there is "nextcloud-with-apps".
-          # for now we use the path passed to nginx. Can be improved in 25.05 via: `config.services.nextcloud.finalPackage`
-          root * ${config.services.nginx.virtualHosts."cloud.${domain}".root}
+          root * ${config.services.nextcloud.finalPackage}
           file_server
           php_fastcgi unix/${config.services.phpfpm.pools."nextcloud".socket} {
-            root ${config.services.nginx.virtualHosts."cloud.${domain}".root}
+            root ${config.services.nextcloud.finalPackage}
             env front_controller_active true
             env modHeadersAvailable true
           }
diff --git a/modules/services/rss-bridge/default.nix b/modules/services/rss-bridge/default.nix
index 5196f44..30a0ac7 100644
--- a/modules/services/rss-bridge/default.nix
+++ b/modules/services/rss-bridge/default.nix
@@ -18,24 +18,9 @@ in
     services.rss-bridge = {
       enable = true;
       config.system.enabled_bridges = [ "*" ]; # Whitelist all
-      virtualHost = null;
-      user = "caddy";
-      group = "caddy";
-      # TODO: with 25.05 this can be simplified via
-      # webserver = "caddy";
+      virtualHost = domain;
+      webserver = "caddy";
     };
-    my.services.webserver.virtualHosts = [
-      {
-        subdomain = "rss-bridge";
-        extraConfig = ''
-          root * ${pkgs.rss-bridge}
-          php_fastcgi unix/${config.services.phpfpm.pools."rss-bridge".socket} {
-            env RSSBRIDGE_fileCache_path ${config.services.rss-bridge.dataDir}/cache/
-          }
-          file_server
-        '';
-      }
-    ];
 
     webapps.apps.rss-bridge = {
       dashboard = {