diff --git a/flake.lock b/flake.lock
index 450958e4..16811518 100644
--- a/flake.lock
+++ b/flake.lock
@@ -103,6 +103,32 @@
         "url": "https://gitea.c3d2.de/astro/bevy-mandelbrot.git"
       }
     },
+    "buzz2elastic": {
+      "inputs": {
+        "naersk": [
+          "naersk"
+        ],
+        "nixpkgs": [
+          "nixos"
+        ],
+        "utils": [
+          "flake-utils"
+        ]
+      },
+      "locked": {
+        "lastModified": 1671937956,
+        "narHash": "sha256-RhG30s2s1H/bLGTmdyeF8vo6Z+lYN5BcOZXTN/ZAJw0=",
+        "ref": "refs/heads/main",
+        "rev": "9f4bd756c91e02610359b9f5551b26582d66f452",
+        "revCount": 5,
+        "type": "git",
+        "url": "https://gitea.c3d2.de/astro/buzz2elastic"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitea.c3d2.de/astro/buzz2elastic"
+      }
+    },
     "buzzrelay": {
       "inputs": {
         "naersk": [
@@ -446,6 +472,7 @@
         "alert2muc": "alert2muc",
         "bevy-julia": "bevy-julia",
         "bevy-mandelbrot": "bevy-mandelbrot",
+        "buzz2elastic": "buzz2elastic",
         "buzzrelay": "buzzrelay",
         "caveman": "caveman",
         "fenix": "fenix",
diff --git a/flake.nix b/flake.nix
index 8b799d60..23cee2d2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,6 +48,14 @@
         rust-overlay.follows = "rust-overlay";
       };
     };
+    buzz2elastic = {
+      url = "git+https://gitea.c3d2.de/astro/buzz2elastic";
+      inputs = {
+        naersk.follows = "naersk";
+        nixpkgs.follows = "nixos";
+        utils.follows = "flake-utils";
+      };
+    };
     buzzrelay = {
       url = "git+https://gitea.c3d2.de/astro/buzzrelay";
       inputs = {
@@ -196,7 +204,7 @@
     };
   };
 
-  outputs = inputs@{ self, alert2muc, fenix, harmonia, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-modules, buzzrelay, caveman, oparl-scraper, scrapers, secrets, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }:
+  outputs = inputs@{ self, alert2muc, fenix, harmonia, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-modules, buzz2elastic, buzzrelay, caveman, oparl-scraper, scrapers, secrets, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }:
     let
       inherit (nixos) lib;
 
@@ -754,6 +762,7 @@
         kibana = nixosSystem' {
           modules = [
             self.nixosModules.cluster-options
+            buzz2elastic.nixosModules.default
             ./hosts/kibana
           ];
         };
diff --git a/hosts/kibana/default.nix b/hosts/kibana/default.nix
index 1cdbaa17..12315ab9 100644
--- a/hosts/kibana/default.nix
+++ b/hosts/kibana/default.nix
@@ -20,6 +20,8 @@
     package = pkgs.kibana7;
   };
 
+  services.buzz2elastic.enable = true;
+
   sops.defaultSopsFile = ./secrets.yaml;
   sops.secrets."nginx/htpasswd" = {
     owner = "nginx";