diff --git a/machines/chungus/media-jellyfin.nix b/machines/chungus/media-jellyfin.nix
index 7841037..e9d634e 100644
--- a/machines/chungus/media-jellyfin.nix
+++ b/machines/chungus/media-jellyfin.nix
@@ -15,7 +15,6 @@
   healthchecks.http.jellyfin = {
     url = "flix.${config.networking.hostName}.private";
   };
-
   healthchecks.closed.retiolum.ports.jellyfin = [ 8096 ];
 
   services.nginx = {
diff --git a/machines/chungus/media-navidrome.nix b/machines/chungus/media-navidrome.nix
index 7c72e7f..68f5639 100644
--- a/machines/chungus/media-navidrome.nix
+++ b/machines/chungus/media-navidrome.nix
@@ -7,10 +7,7 @@
 {
 
   healthchecks.http.navidrome = {
-    #url = "${config.networking.hostName}.wg0:${toString config.services.navidrome.settings.Port}/app/#/login";
-    url = "${
-      config.clan.core.facts.services.wireguard_ip.public."wireguard.wg0.ip".value
-    }:${toString config.services.navidrome.settings.Port}/app/#/login";
+    url = "${config.networking.hostName}.wg0:${toString config.services.navidrome.settings.Port}/app/#/login";
     expectedContent = "Navidrome";
   };
 
diff --git a/machines/orbi/social-matrix-terranix.nix b/machines/orbi/social-matrix-terranix.nix
index 3cc3203..c8479df 100644
--- a/machines/orbi/social-matrix-terranix.nix
+++ b/machines/orbi/social-matrix-terranix.nix
@@ -54,6 +54,10 @@ let
 in
 {
 
+  healthchecks.http."matrix.terranix" = {
+    url = "${baseUrl}/_matrix/client/versions";
+    expectedContent = "versions";
+  };
   networking.firewall.allowedTCPPorts = [
     80
     443