diff --git a/hosts/raptus/headscale/dns.nix b/hosts/raptus/headscale/dns.nix
index 10adb43..72665a4 100644
--- a/hosts/raptus/headscale/dns.nix
+++ b/hosts/raptus/headscale/dns.nix
@@ -45,6 +45,8 @@
           "fritz"
           "dav"
           "ntfy"
+          "octoprint"
+          "assistant"
         ];
     };
   };
diff --git a/hosts/shan/default.nix b/hosts/shan/default.nix
index 4f84e63..7500f76 100644
--- a/hosts/shan/default.nix
+++ b/hosts/shan/default.nix
@@ -28,6 +28,7 @@
   };
 
   modules = {
+    system.networking.bluetooth.enable = true;
     container = {
       kitchenowl = {
         enable = true;
@@ -176,6 +177,42 @@
           enable-login = true;
         };
     };
+
+    octoprint = {
+      enable = true;
+      openFirewall = true;
+      port = 5000;
+    };
+
+    home-assistant = {
+      enable = true;
+      openFirewall = true;
+      configWritable = true;
+      extraComponents = [
+        "tplink_tapo"
+        "tplink"
+        "default_config"
+        "met"
+        "esphome"
+        "mobile_app"
+        "octoprint"
+        "jellyfin"
+        "iron_os"
+        "wake_on_lan"
+      ];
+      config = {
+        default_config = { };
+        http = {
+          server_port = 8123;
+          use_x_forwarded_for = true;
+          trusted_proxies = [
+            "127.0.0.1"
+            "::1"
+            "10.89.0.3"
+          ];
+        };
+      };
+    };
   };
 
   networking.firewall.allowedTCPPorts = [