diff --git a/README.md b/README.md
index 87c2361d..2b0fe958 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [Adguard Home](https://github.com/AdguardTeam/AdGuardHome) - Adguard Home DNS adblocker
 - [Audiobookshelf](https://github.com/advplyr/audiobookshelf) - Audiobookshelf is a self-hosted audiobook and podcast server.
 - [autobrr](https://github.com/autobrr/autobrr) - Automation for downloads.
+- [Baïkal](https://github.com/ckulka/baikal-docker) - A Calendar+Contacts server
 - [Barrage](https://github.com/maulik9898/barrage) - Minimal Deluge WebUI with full mobile support
 - [Bazarr](https://github.com/morpheus65535/bazarr) - A companion application to Sonarr and Radarr that manages and downloads subtitles
 - [Booksonic](https://github.com/popeen) - A server for streaming your audiobooks
diff --git a/apps/baikal/config.json b/apps/baikal/config.json
new file mode 100644
index 00000000..98a92092
--- /dev/null
+++ b/apps/baikal/config.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "../schema.json",
+  "name": "Baïkal",
+  "available": true,
+  "exposable": true,
+  "port": 6556,
+  "id": "baikal",
+  "tipi_version": 1,
+  "version": "0.9.3-nginx",
+  "categories": ["data", "utilities"],
+  "description": "",
+  "short_desc": "Baïkal is a Calendar+Contacts server",
+  "author": "ckulka",
+  "source": "https://github.com/ckulka/baikal-docker",
+  "form_fields": []
+}
diff --git a/apps/baikal/docker-compose.yml b/apps/baikal/docker-compose.yml
new file mode 100644
index 00000000..cb21169e
--- /dev/null
+++ b/apps/baikal/docker-compose.yml
@@ -0,0 +1,38 @@
+version: "3"
+services:
+  baikal:
+    container_name: baikal
+    image: ckulka/baikal:0.9.3-nginx
+    restart: unless-stopped
+    ports:
+      - ${APP_PORT}:80
+    volumes:
+      - ${APP_DATA_DIR}/config:/var/www/baikal/config
+      - ${APP_DATA_DIR}/specific:/var/www/baikal/Specific
+    networks:
+      - tipi_main_network
+    labels:
+      # Main
+      traefik.enable: true
+      traefik.http.middlewares.baikal-web-redirect.redirectscheme.scheme: https
+      traefik.http.services.baikal.loadbalancer.server.port: 80
+      # Web
+      traefik.http.routers.baikal-insecure.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.baikal-insecure.entrypoints: web
+      traefik.http.routers.baikal-insecure.service: baikal
+      traefik.http.routers.baikal-insecure.middlewares: baikal-web-redirect
+      # Websecure
+      traefik.http.routers.baikal.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.baikal.entrypoints: websecure
+      traefik.http.routers.baikal.service: baikal
+      traefik.http.routers.baikal.tls.certresolver: myresolver
+      # Local domain
+      traefik.http.routers.baikal-local-insecure.rule: Host(`baikal.${LOCAL_DOMAIN}`)
+      traefik.http.routers.baikal-local-insecure.entrypoints: web
+      traefik.http.routers.baikal-local-insecure.service: baikal
+      traefik.http.routers.baikal-local-insecure.middlewares: baikal-web-redirect
+      # Local domain secure
+      traefik.http.routers.baikal-local.rule: Host(`baikal.${LOCAL_DOMAIN}`)
+      traefik.http.routers.baikal-local.entrypoints: websecure
+      traefik.http.routers.baikal-local.service: baikal
+      traefik.http.routers.baikal-local.tls: true
diff --git a/apps/baikal/metadata/description.md b/apps/baikal/metadata/description.md
new file mode 100644
index 00000000..2cd91bea
--- /dev/null
+++ b/apps/baikal/metadata/description.md
@@ -0,0 +1,3 @@
+Baïkal is a lightweight CalDAV+CardDAV server. It offers an extensive web interface with easy management of users, address books and calendars. It is fast and simple to install and only needs a basic php capable server. The data can be stored in a MySQL or a SQLite database.
+
+Baïkal allows to seamlessly access your contacts and calendars from every device. It is compatible with iOS, Mac OS X, DAVx5 on Android, Mozilla Thunderbird and every other CalDAV and CardDAV capable application. Protect your privacy by hosting calendars and contacts yourself - with Baïkal.
diff --git a/apps/baikal/metadata/logo.jpg b/apps/baikal/metadata/logo.jpg
new file mode 100644
index 00000000..63e3f1b4
Binary files /dev/null and b/apps/baikal/metadata/logo.jpg differ