diff --git a/system/servenix/default.nix b/system/servenix/default.nix
index c8c0f90c..73e65d4a 100644
--- a/system/servenix/default.nix
+++ b/system/servenix/default.nix
@@ -28,6 +28,7 @@
     ../services/gitea.nix
     ../services/immich.nix
     ../services/jellyfin.nix
+    ../services/kiwix.nix
     ../services/kopia.nix
     ../services/nextcloud.nix
     ../services/nginx-proxy-manager.nix
diff --git a/system/services/kiwix.nix b/system/services/kiwix.nix
new file mode 100644
index 00000000..c019183b
--- /dev/null
+++ b/system/services/kiwix.nix
@@ -0,0 +1,40 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  kiwixVersion = "3.8.1";
+in {
+  virtualisation.oci-containers.containers = {
+    kiwix = {
+      image = "ghcr.io/kiwix/kiwix-serve:${kiwixVersion}";
+      autoStart = true;
+
+      dependsOn = [];
+
+      ports = [
+        # "8080:80"
+      ];
+
+      volumes = [
+        # TODO: Add network location for .zim files
+        "kiwix_data:/data"
+      ];
+
+      environment = {
+        PUID = "1000";
+        PGID = "1000";
+        TZ = "Europe/Berlin";
+      };
+
+      cmd = ["*.zim"];
+
+      extraOptions = [
+        # "--privileged"
+        # "--device=nvidia.com/gpu=all"
+        "--net=behind-nginx"
+      ];
+    };
+  };
+}