diff --git a/hosts/kitty/default.nix b/hosts/kitty/default.nix
index 8c0f3ea..020096b 100644
--- a/hosts/kitty/default.nix
+++ b/hosts/kitty/default.nix
@@ -19,6 +19,7 @@
   system = {
     desktop.enable = false;
     server.enable = true;
+    socials.enable = true;
     wireless.enable = false;
     wireguard.server.enable = true;
     stateVersion = "24.05";
diff --git a/modules/system/services/server/mailserver/default.nix b/modules/system/services/server/mailserver/default.nix
index cb7b82c..f3c8bbc 100644
--- a/modules/system/services/server/mailserver/default.nix
+++ b/modules/system/services/server/mailserver/default.nix
@@ -1,10 +1,8 @@
 { lib, ... }: 
 {
-  options.system.mailserver = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-    };
+  options.system.mailserver.enable = lib.mkOption {
+    type = lib.types.bool;
+    default = false;
   };
 
   imports = [
diff --git a/modules/system/services/server/social/default.nix b/modules/system/services/server/social/default.nix
index 6761bf5..269fbef 100644
--- a/modules/system/services/server/social/default.nix
+++ b/modules/system/services/server/social/default.nix
@@ -1,5 +1,10 @@
-{ ... }:
+{ lib, ... }:
 {
+  options.system.socials.enable = lib.mkOption {
+    type = lib.types.bool;
+    default = false;
+  };
+
   imports = [
     ./mastodon
     ./matrix
diff --git a/modules/system/services/server/social/mastodon/default.nix b/modules/system/services/server/social/mastodon/default.nix
index 2f1f068..340efb5 100644
--- a/modules/system/services/server/social/mastodon/default.nix
+++ b/modules/system/services/server/social/mastodon/default.nix
@@ -1,8 +1,8 @@
 { pkgs, config, ... }:
 {
   services.mastodon = {
-    enable = config.system.server.enable;
-    localDomain = "social.${config.domains.p1}";
+    enable = config.system.socials.enable;
+    localDomain = "social.${config.domains.p2}";
     streamingProcesses = 4;
     configureNginx = true;
     smtp = {
diff --git a/modules/system/services/server/social/matrix/synapse/default.nix b/modules/system/services/server/social/matrix/synapse/default.nix
index 661b205..3470989 100644
--- a/modules/system/services/server/social/matrix/synapse/default.nix
+++ b/modules/system/services/server/social/matrix/synapse/default.nix
@@ -5,7 +5,7 @@
   ];
 
   services.matrix-synapse = {
-    enable = config.system.server.enable;
+    enable = config.system.socials.enable;
     settings = {
       server_name = "${config.domains.p1}";
       public_baseurl = "https://matrix.${config.domains.p1}";
diff --git a/modules/system/services/server/social/owncast/default.nix b/modules/system/services/server/social/owncast/default.nix
index a1cd7ab..0e5fbbe 100644
--- a/modules/system/services/server/social/owncast/default.nix
+++ b/modules/system/services/server/social/owncast/default.nix
@@ -3,7 +3,7 @@
   imports = [ ./nginx ];
 
   services.owncast = {
-    enable = config.system.server.enable;
+    enable = config.system.socials.enable;
     port = 8060;
     rtmp-port = 1945;
     listen = "0.0.0.0";