diff --git a/home/apps/internet/messaging.nix b/home/apps/internet/messaging.nix
index 8fef772..ebd6f1b 100644
--- a/home/apps/internet/messaging.nix
+++ b/home/apps/internet/messaging.nix
@@ -17,12 +17,12 @@
               "m.homeserver" = {
                 base_url =
                   if osConfig.apps.messaging.element.selfhosted then
-                    "https://${osConfig.server.synapse.subdomain}.${osConfig.networking.domain}"
+                    "https://${osConfig.server.social.synapse.subdomain}.${osConfig.networking.domain}"
                   else
                     "https://matrix-client.matrix.org";
                 server_name =
                   if osConfig.apps.messaging.element.selfhosted then
-                    "${osConfig.server.synapse.subdomain}.${osConfig.networking.domain}"
+                    "${osConfig.server.social.synapse.subdomain}.${osConfig.networking.domain}"
                   else
                     "matrix.org";
               };
diff --git a/hosts/marty-latitude/options.nix b/hosts/marty-latitude/options.nix
index 75cbc6c..f572036 100644
--- a/hosts/marty-latitude/options.nix
+++ b/hosts/marty-latitude/options.nix
@@ -152,10 +152,5 @@
         };
       };
     };
-    server = {
-      synapse = {
-        subdomain = "yap";
-      };
-    };
   };
 }
diff --git a/hosts/marty-pc/options.nix b/hosts/marty-pc/options.nix
index a38c5d1..9eb7252 100644
--- a/hosts/marty-pc/options.nix
+++ b/hosts/marty-pc/options.nix
@@ -152,10 +152,5 @@
         };
       };
     };
-    server = {
-      synapse = {
-        subdomain = "yap";
-      };
-    };
   };
 }
diff --git a/hosts/marty-thinkpad/options.nix b/hosts/marty-thinkpad/options.nix
index 42123ae..be0912b 100644
--- a/hosts/marty-thinkpad/options.nix
+++ b/hosts/marty-thinkpad/options.nix
@@ -151,10 +151,5 @@
         };
       };
     };
-    server = {
-      synapse = {
-        subdomain = "yap";
-      };
-    };
   };
 }
diff --git a/modules/server/media/kavita.nix b/modules/server/media/kavita.nix
index e31580a..8aeb57f 100644
--- a/modules/server/media/kavita.nix
+++ b/modules/server/media/kavita.nix
@@ -24,7 +24,6 @@
     services = {
       kavita = {
         enable = config.server.media.kavita.enable;
-        user = config.user.userName;
         settings = {
           Port = config.server.media.kavita.port;
         };
diff --git a/modules/server/social/synapse.nix b/modules/server/social/synapse.nix
index aba373b..a5a9721 100644
--- a/modules/server/social/synapse.nix
+++ b/modules/server/social/synapse.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  fqdn = "${config.server.synapse.subdomain}.${config.networking.domain}";
+  fqdn = "${config.server.social.synapse.subdomain}.${config.networking.domain}";
   baseUrl = "https://${fqdn}";
   clientConfig."m.homeserver".base_url = baseUrl;
   serverConfig."m.server" = "${fqdn}:443";