diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml
index 4cbaf83..4045263 100644
--- a/.forgejo/workflows/test.yml
+++ b/.forgejo/workflows/test.yml
@@ -8,7 +8,7 @@ env:
 
 jobs:
   tests:
-    runs-on: ubuntu-latest
+    runs-on: native
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v4
       # - uses: https://github.com/cachix/cachix-action@v15
diff --git a/hosts/home-server/default.nix b/hosts/home-server/default.nix
index 16fe631..d346a9c 100644
--- a/hosts/home-server/default.nix
+++ b/hosts/home-server/default.nix
@@ -20,7 +20,6 @@ in
   imports = [
     ./disk-config.nix
     ../../hardware/base.nix
-    ../../hardware/bluetooth.nix
     ../../desktop/x11.nix
     ../../system/server.nix
     ../../virtualisation/containers.nix
diff --git a/services/home-assistant/default.nix b/services/home-assistant/default.nix
index a289daa..0e43a5c 100644
--- a/services/home-assistant/default.nix
+++ b/services/home-assistant/default.nix
@@ -76,14 +76,6 @@ in
         # HACS
         aiogithubapi
       ];
-    customComponents = with pkgs.unstable.home-assistant-custom-components; [
-      alarmo
-      adaptive_lighting
-      ingress
-    ];
-    customLovelaceModules = with pkgs.home-assistant-custom-lovelace-modules; [
-      auto-entities
-    ];
     config = {
       homeassistant = {
         name = "Home";
@@ -126,30 +118,12 @@ in
       conversation = {
         intents = { };
       };
-      ingress = {
-        "matter" = {
-          title = "Matter Server";
-          icon = "mdi:home-automation";
-          ui_mode = "toolbar";
-          url = "http://127.0.0.1:${toString config.services.matter-server.port}/";
-        };
-        "otbr" = {
-          title = "OpenThread Border Router";
-          icon = "mdi:home-automation";
-          ui_mode = "toolbar";
-          url = "http://127.0.0.1:${toString config.services.openthread-border-router.web.listenPort}/";
-        };
-      };
     };
     # configWritable = true; # doesn't work atm
   };
 
   services.matter-server = {
     enable = true;
-    extraArgs = [
-      "--storage-path=/var/lib/matter-server"
-      "--bluetooth-adapter=0"
-    ];
   };
 
   services.openthread-border-router = {
@@ -161,7 +135,8 @@ in
       extraDevices = [ "trel://enp2s0" ];
     };
     backboneInterface = "enp2s0";
-    web.enable = true;
+    rest.listenPort = 58081;
+    web.listenPort = 58082;
   };
 
   # systemd-resolved is already providing mDNS, but avahi seems to be required for otbr