diff --git a/apps/kiwix-serve/config.json b/apps/kiwix-serve/config.json
new file mode 100644
index 00000000..35898c4c
--- /dev/null
+++ b/apps/kiwix-serve/config.json
@@ -0,0 +1,19 @@
+{
+  "$schema": "../schema.json",
+  "name": "Kiwix Serve",
+  "port": 8080,
+  "available": true,
+  "exposable": true,
+  "id": "kiwix-serve",
+  "tipi_version": 1,
+  "version": "3.5.0-2",
+  "categories": [
+    "media"
+  ],
+  "description": "Kiwix Serve is a web server for hosting .zim files",
+  "short_desc": "Kiwix Serve is a web server for hosting .zim files",
+  "author": "Kiwix",
+  "source": "https://github.com/kiwix/kiwix-tools/",
+  "website": "https://kiwix.org/",
+  "form_fields": []
+}
\ No newline at end of file
diff --git a/apps/kiwix-serve/docker-compose.yml b/apps/kiwix-serve/docker-compose.yml
new file mode 100644
index 00000000..7c349984
--- /dev/null
+++ b/apps/kiwix-serve/docker-compose.yml
@@ -0,0 +1,39 @@
+version: "3.9"
+
+services:
+  kiwix-serve:
+    container_name: kiwix-serve
+    image: ghcr.io/kiwix/kiwix-serve:3.5.0-2
+    ports:
+      - ${APP_PORT}:8080
+    volumes:
+      - ${APP_DATA_DIR}/zim:/data
+    command: '*.zim'
+    restart: unless-stopped
+    networks:
+      - tipi_main_network
+    labels:
+      # Main
+      traefik.enable: true
+      traefik.http.middlewares.kiwix-serve-web-redirect.redirectscheme.scheme: https
+      traefik.http.services.kiwix-serve.loadbalancer.server.port: 8080
+      # Web
+      traefik.http.routers.kiwix-serve-insecure.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.kiwix-serve-insecure.entrypoints: web
+      traefik.http.routers.kiwix-serve-insecure.service: kiwix-serve
+      traefik.http.routers.kiwix-serve-insecure.middlewares: kiwix-serve-web-redirect
+      # Websecure
+      traefik.http.routers.kiwix-serve.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.kiwix-serve.entrypoints: websecure
+      traefik.http.routers.kiwix-serve.service: kiwix-serve
+      traefik.http.routers.kiwix-serve.tls.certresolver: myresolver
+      # Local domain
+      traefik.http.routers.kiwix-serve-local-insecure.rule: Host(`kiwix-serve.${LOCAL_DOMAIN}`)
+      traefik.http.routers.kiwix-serve-local-insecure.entrypoints: web
+      traefik.http.routers.kiwix-serve-local-insecure.service: kiwix-serve
+      traefik.http.routers.kiwix-serve-local-insecure.middlewares: kiwix-serve-web-redirect
+      # Local domain secure
+      traefik.http.routers.kiwix-serve-local.rule: Host(`kiwix-serve.${LOCAL_DOMAIN}`)
+      traefik.http.routers.kiwix-serve-local.entrypoints: websecure
+      traefik.http.routers.kiwix-serve-local.service: kiwix-serve
+      traefik.http.routers.kiwix-serve-local.tls: true
diff --git a/apps/kiwix-serve/metadata/description.md b/apps/kiwix-serve/metadata/description.md
new file mode 100644
index 00000000..30404ce4
--- /dev/null
+++ b/apps/kiwix-serve/metadata/description.md
@@ -0,0 +1 @@
+TODO
\ No newline at end of file
diff --git a/apps/kiwix-serve/metadata/logo.jpg b/apps/kiwix-serve/metadata/logo.jpg
new file mode 100644
index 00000000..f31a9e0c
Binary files /dev/null and b/apps/kiwix-serve/metadata/logo.jpg differ