diff --git a/machines/calcite/configuration.nix b/machines/calcite/configuration.nix
index d42c585..4b35351 100644
--- a/machines/calcite/configuration.nix
+++ b/machines/calcite/configuration.nix
@@ -208,6 +208,7 @@
     element-desktop
     tdesktop
     qq
+    feishu
 
     # Password manager
     bitwarden
@@ -264,11 +265,6 @@
   custom.forgejo-actions-runner.enable = true;
   custom.forgejo-actions-runner.tokenFile = config.sops.secrets.gitea_env.path;
 
-  custom.prometheus = {
-    enable = true;
-    exporters.enable = true;
-  };
-
   # MTP support
   services.gvfs.enable = true;
 
diff --git a/machines/dolomite/default.nix b/machines/dolomite/default.nix
index 5bf2979..3195b58 100644
--- a/machines/dolomite/default.nix
+++ b/machines/dolomite/default.nix
@@ -49,8 +49,6 @@ in
     networking.firewall.allowedTCPPorts = [ 80 8080 ];
     networking.firewall.allowedUDPPorts = [ ] ++ (lib.range 6311 6314);
 
-    services.tailscale.enable = true;
-
     custom.prometheus = {
       enable = false;
       exporters.enable = false;
diff --git a/machines/massicot/default.nix b/machines/massicot/default.nix
index 5ac8151..7656e12 100644
--- a/machines/massicot/default.nix
+++ b/machines/massicot/default.nix
@@ -8,7 +8,7 @@
     ./services.nix
   ];
 
-  commonSettings = {
+  customSettings = {
     auth.enable = true;
     nix.enable = true;
   };
diff --git a/modules/nixos/prometheus.nix b/modules/nixos/prometheus.nix
index 3e59480..40035f3 100644
--- a/modules/nixos/prometheus.nix
+++ b/modules/nixos/prometheus.nix
@@ -103,7 +103,7 @@ in
               name = "ntfy";
               webhook_configs = [
                 {
-                  url = "https://ntfy.xinyang.life/prometheus-alerts";
+                  url = "${config.services.ntfy-sh.settings.base-url}/prometheus-alerts";
                   send_resolved = true;
                 }
               ];