diff --git a/configs/nextcloud.nix b/configs/nextcloud.nix
index 6ffe18a..3783f8b 100644
--- a/configs/nextcloud.nix
+++ b/configs/nextcloud.nix
@@ -28,7 +28,6 @@ in
 
     hostName = localAddresses.toum;
 
-    nginx.enable = true;
     # https = true;
     config = {
       # overwriteProtocol = "https";
diff --git a/systems/toum/hass/default.nix b/systems/toum/hass/default.nix
index 13a61ec..60362f5 100644
--- a/systems/toum/hass/default.nix
+++ b/systems/toum/hass/default.nix
@@ -4,14 +4,9 @@ let
   inherit (import <niveum/lib>) localAddresses;
 in
 {
-  disabledModules = [
-    "services/misc/home-assistant.nix"
-  ];
-
   imports = [
     ./zigbee.nix
     ./frontend.nix
-    <nixpkgs-unstable/nixos/modules/services/misc/home-assistant.nix>
   ];
 
   services.home-assistant = {
diff --git a/systems/toum/hass/frontend.nix b/systems/toum/hass/frontend.nix
index 5790795..2545a45 100644
--- a/systems/toum/hass/frontend.nix
+++ b/systems/toum/hass/frontend.nix
@@ -2,15 +2,6 @@ let
   inherit (import ./lib.nix) triggers;
 in
 {
-  disabledModules = [
-    "services/misc/home-assistant.nix"
-  ];
-
-  imports = [
-    <nixpkgs-unstable/nixos/modules/services/misc/home-assistant.nix>
-  ];
-
-
   services.home-assistant.config = {
     frontend = {
       themes = {
diff --git a/systems/toum/hass/zigbee.nix b/systems/toum/hass/zigbee.nix
index db55498..29b8a42 100644
--- a/systems/toum/hass/zigbee.nix
+++ b/systems/toum/hass/zigbee.nix
@@ -1,6 +1,5 @@
 { config, pkgs, lib, ... }:
 let
-  inherit (import <stockholm/lib>) genid;
   inherit (import <niveum/lib>) localAddresses;
   zigbee2mqttDevice = "/dev/ttyACM0";
 
@@ -14,7 +13,7 @@ let
     mqtt = {
       discovery = true;
       base_topic = "zigbee";
-      server = "mqtt://${localAddresses.toum}"; # Rasperry local IP
+      server = "mqtt://${localAddresses.toum}";
       user = "albrecht";
       password = lib.strings.fileContents <system-secrets/mosquitto>;
     };
@@ -22,28 +21,14 @@ let
   zigbee2mqtt_cfg = pkgs.writeText "zigbee2mqtt.json" (builtins.toJSON zigbee2mqttConfig);
 in
 {
-  disabledModules = [
-    "services/misc/home-assistant.nix"
-  ];
-
-  imports = [
-    <nixpkgs-unstable/nixos/modules/services/misc/home-assistant.nix>
-    <nixpkgs-unstable/nixos/modules/services/misc/zigbee2mqtt.nix>
-  ];
-
-  /*
-  ids = {
-    uids.zigbee2mqtt = genid "zigbee2mqtt";
-    gids.zigbee2mqtt = genid "zigbee2mqtt";
-  };
   services.zigbee2mqtt = {
     enable = true;
     config = zigbee2mqttConfig;
-    package = pkgs.unstable.zigbee2mqtt;
+    package = pkgs.zigbee2mqtt;
   };
-  */
 
 
+  /*
   system.activationScripts.installZigbee = ''
     install -d /var/lib/zigbee2mqtt
     install ${zigbee2mqtt_cfg} /var/lib/zigbee2mqtt/configuration.yaml
@@ -59,6 +44,7 @@ in
     ];
     volumes = ["/var/lib/zigbee2mqtt:/app/data"];
   };
+  */
 
   services.mosquitto = {
     enable = true;
diff --git a/systems/toum/telegram-bots/autorenkalender.nix b/systems/toum/telegram-bots/autorenkalender.nix
index 14648bc..578e82a 100644
--- a/systems/toum/telegram-bots/autorenkalender.nix
+++ b/systems/toum/telegram-bots/autorenkalender.nix
@@ -3,8 +3,8 @@ let
   autorenkalender-package = pkgs.fetchFromGitHub {
     owner = "kmein";
     repo = "autorenkalender";
-    rev = "1971f082ec6e14d392a0dc3ac62e0b1e4187409b";
-    sha256 = "0hipj616vcsa3f62s83jvlx8zx4bmbgl5h2n4w8ba5ngp40lkmb3";
+    rev = "cf49a7b057301332d980eb47042a626add93db66";
+    sha256 = "1pa7sjg33vdnjianrqldv445jdzzv3mn231ljk1j58hs0cd505gs";
   };
   autorenkalender =
     pkgs.python3Packages.callPackage autorenkalender-package { };