diff --git a/nixos/ryu/containers/default.nix b/nixos/ryu/containers/default.nix
index d01fe771..93872c9c 100644
--- a/nixos/ryu/containers/default.nix
+++ b/nixos/ryu/containers/default.nix
@@ -1,6 +1,6 @@
 {device, ...}: {
   imports = [
-    ./immich-machine-learning.nix
+    # ./immich-machine-learning.nix
   ];
   virtualisation = {
     docker.enable = true;
diff --git a/nixos/ryu/services/default.nix b/nixos/ryu/services/default.nix
index 596d6078..10bd7ac8 100644
--- a/nixos/ryu/services/default.nix
+++ b/nixos/ryu/services/default.nix
@@ -1,26 +1,26 @@
 {...}: {
   imports = [
     # ./rsyncd.nix
-    # ./sunshine.nix
     # ./zerotier.nix
     # ./dnscrypt.nix
-    ./ollama.nix
-    ./tailscale.nix
-    ./samba.nix
-    ./mullvad.nix
-    ./openrgb.nix
-    ./command-runner.nix
-    ./resolved.nix
-    ./minecraft.nix
-    ./fwupd.nix
     ./caddy.nix
-    ./monitoring.nix
-    ./wivrn.nix
-    ./sshd.nix
-    ./fprintd.nix
-    ./handoff.nix
-    ./gstreamer.nix
+    ./command-runner.nix
     ./dualsense.nix
+    ./fprintd.nix
+    ./fwupd.nix
+    ./gstreamer.nix
+    ./handoff.nix
+    ./minecraft.nix
+    ./monitoring.nix
+    ./mullvad.nix
+    ./ollama.nix
+    ./openrgb.nix
     ./openssh.nix
+    ./resolved.nix
+    ./samba.nix
+    ./sshd.nix
+    # ./sunshine.nix
+    ./tailscale.nix
+    ./wivrn.nix
   ];
 }
diff --git a/nixos/tako/services/blocky.nix b/nixos/tako/services/blocky.nix
new file mode 100644
index 00000000..3578230b
--- /dev/null
+++ b/nixos/tako/services/blocky.nix
@@ -0,0 +1,19 @@
+{
+  device,
+  config,
+  ...
+}: {
+  services = {
+    blocky = {
+      enable = true;
+      settings = {
+        ports.dns = 53;
+        ports.http = 83838;
+        ports.dohPath = "/dns-query";
+      };
+    };
+    caddy.virtualHosts."blocky.${device.domain}".extraConfig = ''
+      reverse_proxy localhost:83838
+    '';
+  };
+}
diff --git a/nixos/tako/services/homepage.nix b/nixos/tako/services/homepage.nix
index 92da706d..53deb0e0 100644
--- a/nixos/tako/services/homepage.nix
+++ b/nixos/tako/services/homepage.nix
@@ -24,6 +24,7 @@
                 icon = "jellyfin.png";
                 description = "Jellyfin Media Server";
                 href = "https://jellyfin.tsuba.darksailor.dev";
+                ping = "jellyfin.tsuba.darksailor.dev";
               };
             }
             {
@@ -31,6 +32,7 @@
                 icon = "sonarr.png";
                 description = "Sonarr: TV Series Management";
                 href = "https://sonarr.tsuba.darksailor.dev";
+                ping = "sonarr.tsuba.darksailor.dev";
               };
             }
             {
@@ -38,6 +40,7 @@
                 icon = "bazarr.png";
                 description = "Bazarr: Subtitles and Metadata";
                 href = "https://bazarr.tsuba.darksailor.dev";
+                ping = "bazarr.tsuba.darksailor.dev";
               };
             }
             {
@@ -45,6 +48,7 @@
                 icon = "radarr.png";
                 description = "Radarr: Movie Management";
                 href = "https://radarr.tsuba.darksailor.dev";
+                ping = "radarr.tsuba.darksailor.dev";
               };
             }
             {
@@ -52,13 +56,15 @@
                 icon = "deluge.png";
                 description = "Deluge: Torrent Client";
                 href = "https://deluge.tsuba.darksailor.dev";
+                ping = "deluge.tsuba.darksailor.dev";
               };
             }
             {
               "Prowlarr" = {
                 icon = "prowlarr.png";
                 description = "Prowlarr: Indexer Manager";
-                href = "https://prowlarr.tsuba.darksailor.dev";
+                href = "https://prowlarr.darksailor.dev";
+                ping = "prowlarr.darksailor.dev";
               };
             }
             {
@@ -66,6 +72,7 @@
                 icon = "home-assistant.png";
                 description = "Home Automation";
                 href = "https://home.darksailor.dev";
+                ping = "home.darksailor.dev";
               };
             }
           ];
@@ -77,6 +84,7 @@
                 icon = "gitea.png";
                 description = "Gitea Code Hosting";
                 href = "https://git.darksailor.dev";
+                ping = "git.darksailor.dev";
               };
             }
             {
@@ -84,6 +92,7 @@
                 icon = "nextcloud.png";
                 description = "Nextcloud Suite";
                 href = "https://cloud.darksailor.dev";
+                ping = "cloud.darksailor.dev";
               };
             }
             {
@@ -91,6 +100,7 @@
                 icon = "immich.png";
                 description = "Immich: Self-hosted Photo and Video Backup";
                 href = "https://photos.darksailor.dev";
+                ping = "photos.darksailor.dev";
               };
             }
             {
@@ -98,6 +108,7 @@
                 icon = "excalidraw.png";
                 description = "Excalidraw: Self-hosted Collaborative Whiteboard";
                 href = "https://draw.darksailor.dev";
+                ping = "draw.darksailor.dev";
               };
             }
             {
@@ -105,13 +116,15 @@
                 icon = "navidrome.png";
                 description = "A self-hosted music server and streamer.";
                 href = "https://music.darksailor.dev";
+                ping = "music.darksailor.dev";
               };
             }
             {
               "OpenwebUI" = {
-                icon = "openwebui.png";
+                icon = "open-webui.png";
                 description = "OpenwebUI: Self-hosted AI chat interface";
                 href = "https://chat.darksailor.dev";
+                ping = "chat.darksailor.dev";
               };
             }
           ];
@@ -166,23 +179,22 @@
     };
     caddy = {
       virtualHosts."dashboard.darksailor.dev".extraConfig = ''
-        # import auth
         reverse_proxy localhost:${builtins.toString config.services.homepage-dashboard.listenPort}
       '';
     };
-    authelia = {
-      instances.darksailor = {
-        settings = {
-          access_control = {
-            rules = [
-              {
-                domain = "dashboard.darksailor.dev";
-                policy = "one_factor";
-              }
-            ];
-          };
-        };
-      };
-    };
+    # authelia = {
+    #   instances.darksailor = {
+    #     settings = {
+    #       access_control = {
+    #         rules = [
+    #           {
+    #             domain = "dashboard.darksailor.dev";
+    #             policy = "one_factor";
+    #           }
+    #         ];
+    #       };
+    #     };
+    #   };
+    # };
   };
 }